1. Mailing Lists
  2. Contributors
  3. Re: My first contribution -> Sales Order's Expected Delivery Date.

Contributors mailing list archives

contributors@odoo-community.org

Browse archives

Re: My first contribution -> Sales Order's Expected Delivery Date.

Re: My first contribution -> Sales Order's Expected Delivery Date.

Avatar

Re: My first contribution -> Sales Order's Expected Delivery Date.

by
Matmoz D.O.O., Matjaž Mozetič
- 22/06/2015 06:00:53

There are just a few pointers on how I manage the situation.

 

Regarding:

  • And as we split to so many branches now, how do we maintain relation between OCA's branches and our deployed projects' addons to still be sync (or know something has been updated)?

 

 

1st step:

 

Making OCA forks and keep them synchronized with the original OCA

(I'll do an example with project-service to keep it simple, but it can be done with all the git repositories)

 

1 - So I would fork https://github.com/OCA/project-service throuhj the github web UI and I get https://github.com/sysadminmatmoz/project-service

 

2 - On my local machine I'll clone my fork:

git clone git@github.com:sysadminmatmoz/project-service.git

 

3 - I'll put the path to the original upstream repository to be able to synchronize my fork with the original

cd project-service

git remote add upstream git@github.com:OCA/project-service.git

 

4 - To synchronize (update) my forked branch with the original repository (when I see the This branch is x commits behind with OCA:8.0 on the github webpage) I need:

git fetch upstream

 

5 - Once I fetched the upstream commits, I need to rebase them to my branch (example when I maintain 8.0 branch):

git rebase upstream/8.0

 

6. Merge my custom changes to the rebased code:

git pull

 

7. Push my locally synchronized branch to my github branch:

git push

 

 

Regarding:

 

  • Says, I should have following, and all of them will be published to Odoo App Store automatically, correct?
  • kittiu/sale-workflow
  • kittiu/virtical-construction
  • kittiu/account-invoicing
  • ete...

 

  • But then, I would be confused on which module is my own creation, how do most people manage this situaton. Are there way to still work on one own branch, and still be able to contribute to OCA's branches?

Forks are not published in the Odoo App Store, so no confusion.

 

Regards,

 

 

 

On Sunday 21 of June 2015 16:22:58 Kitti U. wrote:

Dear community,


I have some question about good way to maintaining our branch while doing contribution to OCA branches.


Says, normally I have our own branch for generic modules of our company -> https://github.com/kittiu/addons-eco (this branch is now register to Odoo App Store). As such, this is the only branch we have to maintain for all our new addons.


Questions:

  • As I start to work on OCA. I should not have my own branch, but rather split them to OCA branches?
  • Says, I should have following, and all of them will be published to Odoo App Store automatically, correct?
    • kittiu/sale-workflow
    • kittiu/virtical-construction
    • kittiu/account-invoicing
    • ete...
  • But then, I would be confused on which module is my own creation, how do most people manage this situaton. Are there way to still work on one own branch, and still be able to contribute to OCA's branches?
  • And as we split to so many branches now, how do we maintain relation between OCA's branches and our deployed projects' addons to still be sync (or know something has been updated)?


Sorry if my questions confuse you. Basically, I am finding the workflow to work best, maintaining my projects, and contribution.


Many thanks,

Kitti U.




On Sun, Jun 21, 2015 at 10:56 PM, Kitti U. <kittiu@ecosoft.co.th> wrote:

Dear community,


I have done my first PR. https://github.com/OCA/sale-workflow/pull/168


Hope to contribute more and more. But first, I have to know how to properly do it.


Any suggestion are very welcome !


Kitti U.

-- 

Mobile: +66-(0)8-1841-7480

Your ERP Partner => www.ecosoft.co.th




--

Mobile: +66-(0)8-1841-7480

Your ERP Partner => www.ecosoft.co.th

_______________________________________________
Mailing-List: http://odoo-community.org/groups/oca-contributors-15
Post to: mailto:contributors@odoo-community.org
Unsubscribe: http://odoo-community.org/groups?unsubscribe




--

Matjaž Mozetič

 

MATMOZ d.o.o.

cell: +386 41 745 131

skype: rationalperseus

 

 

 

Reference