From ecffb93f7662fc0252941474b52953f0460a6618 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 26 May 2014 11:39:48 +0200 Subject: [PATCH 1/4] Adding basic contribution guidelines --- contributing.md | 35 +++++++++++++++++++++++++++ doc/_static/pull-request-version.png | Bin 0 -> 12880 bytes 2 files changed, 35 insertions(+) create mode 100644 contributing.md create mode 100644 doc/_static/pull-request-version.png diff --git a/contributing.md b/contributing.md new file mode 100644 index 00000000000..bb2852058fd --- /dev/null +++ b/contributing.md @@ -0,0 +1,35 @@ +Contributing to Odoo +==================== + +Reporting Issues +---------------- +If possible, always attach a pull request when creating an issue (GitHub will automatically create an issue when submiting the changes). The issues not linked to a pull request or an internal ticket on odoo.com will be handled with a lower priority. +If later on you create a pull request solving an opened issue, do not forget to reference to it in your pull request (e.g.: "This patch fixes issue #42"). + +Which version should I submit to? +--------------------------------- +Periodically, we forward port the fixes realised in the latest stable version to master and intermediate saas repositories. This means that you should submit your pull request against the lowest supported version. If applying, you should always submit your code against `odoo/7.0`. The `saas-x` versions are intermediate versions + +![Submiting against the right version](/doc/_static/pull-request-version.png) + +However your change **must** be submited against `odoo/master` if + +* it modifies the database structure (e.g.: adding a new field) +* it adds a new feature + +Why was my fix is set as blocked? +--------------------------------- +The label *blocked* is used when an action is required from the submiter. The typical reasons are: + +* the fix is incomplete/incorrect and a change is required +* more information is required + +Pull requests with the blocked label will not be processed as long as the label remains. Once the correction done, we will review it and eventually remove the label. + +Why was my issue closed without merging? +---------------------------------------- +A pull request is closed when it will not be merged into odoo. The typical reasons are: + +* the fix/issue is invalid (label *wontfix*) +* the fix/issue is a duplicated of another opened issue +* the pull request should be resubmited against another version diff --git a/doc/_static/pull-request-version.png b/doc/_static/pull-request-version.png new file mode 100644 index 0000000000000000000000000000000000000000..dd45388d07238067088fda43401e72704aac3898 GIT binary patch literal 12880 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 B%4`4t literal 0 HcmV?d00001 From 34c490e40fd40793be4e00efa28e854c6bb9dba2 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 26 May 2014 12:21:23 +0200 Subject: [PATCH 2/4] Adding bug report example and fixing typos --- contributing.md | 57 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/contributing.md b/contributing.md index bb2852058fd..6a2f41eeaf9 100644 --- a/contributing.md +++ b/contributing.md @@ -3,23 +3,48 @@ Contributing to Odoo Reporting Issues ---------------- -If possible, always attach a pull request when creating an issue (GitHub will automatically create an issue when submiting the changes). The issues not linked to a pull request or an internal ticket on odoo.com will be handled with a lower priority. +If possible, always attach a pull request when creating an issue (GitHub will automatically create an issue when submitting the changes). The issues not linked to a pull request or an internal request on odoo.com will be handled with a lower priority. + If later on you create a pull request solving an opened issue, do not forget to reference to it in your pull request (e.g.: "This patch fixes issue #42"). -Which version should I submit to? ---------------------------------- -Periodically, we forward port the fixes realised in the latest stable version to master and intermediate saas repositories. This means that you should submit your pull request against the lowest supported version. If applying, you should always submit your code against `odoo/7.0`. The `saas-x` versions are intermediate versions +When reporting an issue or creating a pull request, use the following structure: + +> **Quantity field is ignored in a sale order** +> +> Impacted versions: +> +> - 7.0 and above +> +> Steps to reproduce: +> +> 1. create a new sale order +> 2. add a line with product 'Service', quantity 2, unit price 10.0 +> 3. validate the sale order +> +> Expected behavior: +> +> - Total price of 10.0 +> +> Expected behavior: +> +> - Total price of 20.0 (2 * 10 = 20) + +For web or rendering issues, do not forget to specify the operating system and browser you are using. + +Against which version should I submit a patch? +---------------------------------------------- +Periodically, we forward port the fixes realized in the latest stable version to master and intermediate saas repositories. This means that you should submit your pull request against the lowest supported version. If applying, you should always submit your code against `odoo/7.0`. The `saas-x` versions are intermediate versions between stable versions. ![Submiting against the right version](/doc/_static/pull-request-version.png) -However your change **must** be submited against `odoo/master` if +However your change **must** be submitted against `odoo/master` if * it modifies the database structure (e.g.: adding a new field) * it adds a new feature -Why was my fix is set as blocked? ---------------------------------- -The label *blocked* is used when an action is required from the submiter. The typical reasons are: +Why was my fix labeled as blocked? +---------------------------------- +The label *blocked* is used when an action is required from the submitter. The typical reasons are: * the fix is incomplete/incorrect and a change is required * more information is required @@ -28,8 +53,16 @@ Pull requests with the blocked label will not be processed as long as the label Why was my issue closed without merging? ---------------------------------------- -A pull request is closed when it will not be merged into odoo. The typical reasons are: +A pull request is closed when it will not be merged into odoo. This will typically happens if the fix/issue: -* the fix/issue is invalid (label *wontfix*) -* the fix/issue is a duplicated of another opened issue -* the pull request should be resubmited against another version +* is not relevant to odoo development (label *invalid*) +* is not considered as a bug or we have no plan to change the current behavior (label *wontfix*) +* is a duplicated of another opened issue (label *duplicate*) +* the pull request should be resubmitted against another version + +What is this odoo-dev repository? Should I use it? +-------------------------------------------------- + +The `odoo-dev/odoo` repository is an internal repository used by the R&D of Odoo to keep the main repository clean. If you come from Launchpad, this is the equivalent of the `~openerp-dev` repository. + +When forking odoo to submit a patch, always use the `github.com/odoo/odoo` repository. Be also careful of the version you are branching as it will determine the history once the pull request will be realized (e.g.: `git checkout -b 7.0-my-branch odoo/7.0`). From 41c4090d20901b38720c25007f4c3b632cf75197 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 26 May 2014 12:22:59 +0200 Subject: [PATCH 3/4] typo --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing.md b/contributing.md index 6a2f41eeaf9..219c379433e 100644 --- a/contributing.md +++ b/contributing.md @@ -63,6 +63,6 @@ A pull request is closed when it will not be merged into odoo. This will typical What is this odoo-dev repository? Should I use it? -------------------------------------------------- -The `odoo-dev/odoo` repository is an internal repository used by the R&D of Odoo to keep the main repository clean. If you come from Launchpad, this is the equivalent of the `~openerp-dev` repository. +The `odoo-dev/odoo` repository is an internal repository used by the R&D of Odoo to keep the main repository clean. If you are coming from Launchpad, this is the equivalent of the `~openerp-dev` repository. When forking odoo to submit a patch, always use the `github.com/odoo/odoo` repository. Be also careful of the version you are branching as it will determine the history once the pull request will be realized (e.g.: `git checkout -b 7.0-my-branch odoo/7.0`). From c0e326eb9beee70b8fb8e63b694f43d99a62eded Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 26 May 2014 12:55:58 +0200 Subject: [PATCH 4/4] Update contributing.md --- contributing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing.md b/contributing.md index 219c379433e..0575bebb52d 100644 --- a/contributing.md +++ b/contributing.md @@ -21,7 +21,7 @@ When reporting an issue or creating a pull request, use the following structure: > 2. add a line with product 'Service', quantity 2, unit price 10.0 > 3. validate the sale order > -> Expected behavior: +> Current behavior: > > - Total price of 10.0 >