[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr/dolibarr] a67267: FIX : units traductions for selectUnits() fu
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr/dolibarr] a67267: FIX : units traductions for selectUnits() function |
|
Date: |
Mon, 23 Dec 2019 05:16:39 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: a672673319dfc7216c8236f4569df1475dc41ba6
https://github.com/Dolibarr/dolibarr/commit/a672673319dfc7216c8236f4569df1475dc41ba6
Author: gauthier <address@hidden>
Date: 2019-12-17 (Tue, 17 Dec 2019)
Changed paths:
M htdocs/langs/en_US/products.lang
Log Message:
-----------
FIX : units traductions for selectUnits() function
Commit: 7b1bf32cd9087c7c40a10207eac40931e6ebae97
https://github.com/Dolibarr/dolibarr/commit/7b1bf32cd9087c7c40a10207eac40931e6ebae97
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-17 (Tue, 17 Dec 2019)
Changed paths:
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Update products.lang
Commit: 95b56f05183027eaa3ae6136be5c28e803169800
https://github.com/Dolibarr/dolibarr/commit/95b56f05183027eaa3ae6136be5c28e803169800
Author: Francis Appels <address@hidden>
Date: 2019-12-17 (Tue, 17 Dec 2019)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Update 6.0.0-7.0.0.sql
timestamp NOT NULL can cause SQL error.
Commit: 3e19702e392ee26a6dfbf36e700fd474805f2736
https://github.com/Dolibarr/dolibarr/commit/3e19702e392ee26a6dfbf36e700fd474805f2736
Author: Maxime Kohlhaas <address@hidden>
Date: 2019-12-17 (Tue, 17 Dec 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Fix prevent double action on shipment close
Commit: cc8a291f284c74f62012038d959773fd2dbd5d37
https://github.com/Dolibarr/dolibarr/commit/cc8a291f284c74f62012038d959773fd2dbd5d37
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-17 (Tue, 17 Dec 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Merge pull request #12730 from atm-maxime/fix_shipment_close
Fix prevent double action on shipment close
Commit: 3fb72c349f47179d088d78201faac965e77da80a
https://github.com/Dolibarr/dolibarr/commit/3fb72c349f47179d088d78201faac965e77da80a
Author: Alexandre SPANGARO <address@hidden>
Date: 2019-12-18 (Wed, 18 Dec 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Fix language traduction on import/export tools
Commit: 163ba0d4807a0dfa6c46443fcfff610ff2d8239f
https://github.com/Dolibarr/dolibarr/commit/163ba0d4807a0dfa6c46443fcfff610ff2d8239f
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-18 (Wed, 18 Dec 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Merge pull request #12732 from aspangaro/10.0_p11
Fix language traduction on import/export tools
Commit: 451b32674e2a0e1a516b2e251393ca7d0013cc5d
https://github.com/Dolibarr/dolibarr/commit/451b32674e2a0e1a516b2e251393ca7d0013cc5d
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-18 (Wed, 18 Dec 2019)
Changed paths:
M htdocs/install/mysql/data/llx_c_units.sql
Log Message:
-----------
Removed duplicate record
Commit: 92facbc892bf337914ddca4ecc79a7f9f943d63c
https://github.com/Dolibarr/dolibarr/commit/92facbc892bf337914ddca4ecc79a7f9f943d63c
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-18 (Wed, 18 Dec 2019)
Changed paths:
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad
FIX : units traductions for selectUnits() function
Commit: ea93c687a2364ea72c01a077a83f3b9b6161beab
https://github.com/Dolibarr/dolibarr/commit/ea93c687a2364ea72c01a077a83f3b9b6161beab
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-18 (Wed, 18 Dec 2019)
Changed paths:
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/products.lang
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 6789b7bd1ef54e32142997b4bf16e0c75b121fbf
https://github.com/Dolibarr/dolibarr/commit/6789b7bd1ef54e32142997b4bf16e0c75b121fbf
Author: ptibogxiv <address@hidden>
Date: 2019-12-18 (Wed, 18 Dec 2019)
Changed paths:
M htdocs/install/mysql/data/llx_c_units.sql
Log Message:
-----------
Fix day scale unit
Commit: 5863319660c4ece3e73c61d1441ee91ea3b7627e
https://github.com/Dolibarr/dolibarr/commit/5863319660c4ece3e73c61d1441ee91ea3b7627e
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/install/mysql/data/llx_c_units.sql
Log Message:
-----------
Merge pull request #12735 from ptibogxiv/patch-290
Fix day scale unit
Commit: 538921f47977c56cbf9aadbdb87bc60b705f6f5a
https://github.com/Dolibarr/dolibarr/commit/538921f47977c56cbf9aadbdb87bc60b705f6f5a
Author: Pierre Ardoin <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/core/class/html.formmargin.class.php
Log Message:
-----------
#FIX Error Margin with Situation Invoice
Fix an issue that show a negative margin when $line->situation_percent is not
100%
Now, the margin price take progress into account.
Commit: 063c139feefe0a7d6552a14c0649aa3c83aa5ca0
https://github.com/Dolibarr/dolibarr/commit/063c139feefe0a7d6552a14c0649aa3c83aa5ca0
Author: Pierre Ardoin <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/margin/productMargins.php
Log Message:
-----------
Situation Invoice Compatibility
take progress percent into account in buying price
Commit: 14cf295f22b10269cbb5a111c32f0f8ccb7c4714
https://github.com/Dolibarr/dolibarr/commit/14cf295f22b10269cbb5a111c32f0f8ccb7c4714
Author: Pierre Ardoin <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/margin/tabs/productMargins.php
Log Message:
-----------
Update to integer situation invoice
Before : Situation invoice with situation_percent < 100 => Negative and Bad
margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and
proportional.
Commit: 347eae05acf9b5cc613bb6c946648ddabde28053
https://github.com/Dolibarr/dolibarr/commit/347eae05acf9b5cc613bb6c946648ddabde28053
Author: Pierre Ardoin <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/margin/customerMargins.php
Log Message:
-----------
Update to integer situation invoice
Before : Situation invoice with situation_percent < 100 => Negative and Bad
margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and
proportional.
Commit: a82f996fcf63d35cb3eb455635cd728f802f3eba
https://github.com/Dolibarr/dolibarr/commit/a82f996fcf63d35cb3eb455635cd728f802f3eba
Author: Pierre Ardoin <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Update to integer situation invoice
Before : Situation invoice with situation_percent < 100 => Negative and Bad
margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and
proportional.
Commit: 91e2fe9a9997f52d901a6cd964d97ac7b48705e9
https://github.com/Dolibarr/dolibarr/commit/91e2fe9a9997f52d901a6cd964d97ac7b48705e9
Author: Pierre Ardoin <address@hidden>
Date: 2019-12-19 (Thu, 19 Dec 2019)
Changed paths:
M htdocs/margin/agentMargins.php
Log Message:
-----------
Update to integer situation invoice
Before : Situation invoice with situation_percent < 100 => Negative and Bad
margin (not proportional)
Now : Situation invoice with situation_percent < 100 => Correct and
proportional.
Commit: 8321fe6ad2b36623600b00f877111be92f8c0661
https://github.com/Dolibarr/dolibarr/commit/8321fe6ad2b36623600b00f877111be92f8c0661
Author: Regis Houssin <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
FIX missing nl2br conversion
Commit: adb4f333122b7e9b7b68629f1bcc1cb60970777b
https://github.com/Dolibarr/dolibarr/commit/adb4f333122b7e9b7b68629f1bcc1cb60970777b
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/core/class/CMailFile.class.php
Log Message:
-----------
Merge pull request #12743 from hregis/10.0_mc
FIX missing nl2br conversion
Commit: e60ae67acafe3a7b1a26c8e74197432b9d36d91f
https://github.com/Dolibarr/dolibarr/commit/e60ae67acafe3a7b1a26c8e74197432b9d36d91f
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/salaries/stats/index.php
Log Message:
-----------
Fix stats page
Commit: dd9f25b13a8db2805a7b2e98d12c678be6112fd0
https://github.com/Dolibarr/dolibarr/commit/dd9f25b13a8db2805a7b2e98d12c678be6112fd0
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/takepos/takepos.php
Log Message:
-----------
CSS
Commit: 3ae5901a6434e6da8f30a6f0ab81870586f24ba6
https://github.com/Dolibarr/dolibarr/commit/3ae5901a6434e6da8f30a6f0ab81870586f24ba6
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/compta/prelevement/bons.php
Log Message:
-----------
Fix look and feel v11
Commit: 3036ff637f498b37ba5322246958a500f79fd251
https://github.com/Dolibarr/dolibarr/commit/3036ff637f498b37ba5322246958a500f79fd251
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/compta/cashcontrol/cashcontrol_list.php
Log Message:
-----------
Fix bad url
Commit: daae053e395be4add2ec72b407f61c1cd52d83a7
https://github.com/Dolibarr/dolibarr/commit/daae053e395be4add2ec72b407f61c1cd52d83a7
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/compta/cashcontrol/cashcontrol_card.php
Log Message:
-----------
Debug CashFence feature
Commit: 693551069b5c014ca4f01670158ab4383be75001
https://github.com/Dolibarr/dolibarr/commit/693551069b5c014ca4f01670158ab4383be75001
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/admin/facture_situation.php
M htdocs/admin/payment.php
M htdocs/core/lib/invoice.lib.php
Log Message:
-----------
Fix look and feel v11
Commit: d59357d88dbc44e1933b1277fc97fed8c7c9f8fc
https://github.com/Dolibarr/dolibarr/commit/d59357d88dbc44e1933b1277fc97fed8c7c9f8fc
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/admin/facture_situation.php
Log Message:
-----------
Fix help
Commit: 77ab6604fd337ed91c0b95c504687d3c420d5a44
https://github.com/Dolibarr/dolibarr/commit/77ab6604fd337ed91c0b95c504687d3c420d5a44
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge pull request #12740 from mapiolca/patch-17
FIX Invoice Situation integration into Margin
Commit: 78fa75c6b044a78c81c12c6992533c3ff9692b3a
https://github.com/Dolibarr/dolibarr/commit/78fa75c6b044a78c81c12c6992533c3ff9692b3a
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-22 (Sun, 22 Dec 2019)
Changed paths:
M htdocs/theme/eldy/theme_vars.inc.php
Log Message:
-----------
css
Commit: c39e45b81a23eb12359c009b628bccc5b3fe5e6e
https://github.com/Dolibarr/dolibarr/commit/c39e45b81a23eb12359c009b628bccc5b3fe5e6e
Author: VESSILLER <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
FIX set due date in object in create invoice
Commit: d4138876af8572b3e292a6e8bcbd2f50f28ceee8
https://github.com/Dolibarr/dolibarr/commit/d4138876af8572b3e292a6e8bcbd2f50f28ceee8
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Fix alignement in validation popup
Commit: 558d57730997ce7df837a2fd2423ca6a64708c29
https://github.com/Dolibarr/dolibarr/commit/558d57730997ce7df837a2fd2423ca6a64708c29
Author: VESSILLER <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/categories/traduction.php
Log Message:
-----------
FIX add and modify category translate form with posted values on errors
Commit: e59514600b6c9e8ada4e89a0a558b5a605c31ffc
https://github.com/Dolibarr/dolibarr/commit/e59514600b6c9e8ada4e89a0a558b5a605c31ffc
Author: VESSILLER <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/contact/card.php
Log Message:
-----------
FIX contact card state address selected after filling address
Commit: 2df9df2db031018ead4d14710ab6b0e77bee760d
https://github.com/Dolibarr/dolibarr/commit/2df9df2db031018ead4d14710ab6b0e77bee760d
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/core/class/html.formother.class.php
M htdocs/core/commonfieldsinexport.inc.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modFacture.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/imports/import.php
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/cashdesk.lang
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/theme/eldy/global.inc.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Debug v11
Commit: 89528e46f1a54e09537909d13cd868b958a43b99
https://github.com/Dolibarr/dolibarr/commit/89528e46f1a54e09537909d13cd868b958a43b99
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/theme/eldy/theme_vars.inc.php
Log Message:
-----------
css
Commit: a92db7db399a29e784a8d9e1e8a09a37be8653fe
https://github.com/Dolibarr/dolibarr/commit/a92db7db399a29e784a8d9e1e8a09a37be8653fe
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/core/class/html.formother.class.php
M htdocs/imports/import.php
Log Message:
-----------
Look and feel v11
Commit: b525025f9d7fd87bbd884da1a9f867a455ef6aaf
https://github.com/Dolibarr/dolibarr/commit/b525025f9d7fd87bbd884da1a9f867a455ef6aaf
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/theme/eldy/theme_vars.inc.php
Log Message:
-----------
CSS
Commit: b1a99c1e231ca866b18facff37b33fcb6e5636e7
https://github.com/Dolibarr/dolibarr/commit/b1a99c1e231ca866b18facff37b33fcb6e5636e7
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/theme/eldy/global.inc.php
Log Message:
-----------
CSS
Commit: 4d12ecb072e20db60817547455aa7d9d53d8c484
https://github.com/Dolibarr/dolibarr/commit/4d12ecb072e20db60817547455aa7d9d53d8c484
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
FIX #12745
Commit: e963fa4b07f06cf10549007bf775d0fc32fef3be
https://github.com/Dolibarr/dolibarr/commit/e963fa4b07f06cf10549007bf775d0fc32fef3be
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/core/class/CMailFile.class.php
M htdocs/install/mysql/data/llx_c_units.sql
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: b3400fac249ff7138dcc20f1337b18c38c5ccaf1
https://github.com/Dolibarr/dolibarr/commit/b3400fac249ff7138dcc20f1337b18c38c5ccaf1
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Merge pull request #12744 from OPEN-DSI/v10-fix-facture-duedate-and-paid
FIX set due date in object in create invoice
Commit: 93cece6a3a3f9148962d81014477d1601caac1fb
https://github.com/Dolibarr/dolibarr/commit/93cece6a3a3f9148962d81014477d1601caac1fb
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/core/class/html.formmargin.class.php
Log Message:
-----------
Merge pull request #12738 from mapiolca/patch-16
#FIX Error Margin with Situation Invoice
Commit: 15031a3e870e22fc268b606137a50eceafd9b810
https://github.com/Dolibarr/dolibarr/commit/15031a3e870e22fc268b606137a50eceafd9b810
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/categories/traduction.php
Log Message:
-----------
Merge pull request #12746 from OPEN-DSI/v10-fix-categories-traduction-backurl
FIX add and modify category translate form with posted values on errors
Commit: 1229e8bc4b6863e8db1d30cc9cdefe7dae6dec34
https://github.com/Dolibarr/dolibarr/commit/1229e8bc4b6863e8db1d30cc9cdefe7dae6dec34
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/contact/card.php
Log Message:
-----------
Merge pull request #12747 from OPEN-DSI/v10-fix-contact-card-select-state
FIX contact card state address selected after filling address
Commit: 0ea5df36c19798cfa1028e3372002388f9bd591f
https://github.com/Dolibarr/dolibarr/commit/0ea5df36c19798cfa1028e3372002388f9bd591f
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
Disable ping for alpha versions
Commit: 76d23141fdbd4e9760c8a4d3da5cbce6fcbea3b4
https://github.com/Dolibarr/dolibarr/commit/76d23141fdbd4e9760c8a4d3da5cbce6fcbea3b4
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge pull request #12727 from fappels/patch-1
Update 6.0.0-7.0.0.sql
Commit: 36e6036e9e393c37667c815583b0b1a6e76c4ddd
https://github.com/Dolibarr/dolibarr/commit/36e6036e9e393c37667c815583b0b1a6e76c4ddd
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge branch '8.0' of address@hidden:Dolibarr/dolibarr.git into 9.0
Commit: eb32e9812733f53c4dbb8cea38ba56c3e2ae733c
https://github.com/Dolibarr/dolibarr/commit/eb32e9812733f53c4dbb8cea38ba56c3e2ae733c
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/expedition/class/expedition.class.php
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
Log Message:
-----------
Merge branch '9.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 7b08ce9fb8d1bd46638e775475517c36fe565caa
https://github.com/Dolibarr/dolibarr/commit/7b08ce9fb8d1bd46638e775475517c36fe565caa
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/categories/traduction.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/card.php
M htdocs/core/class/html.formmargin.class.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 10.0
Commit: 9a08a6bf6d62415ef8efa1d6e573000dee7ee203
https://github.com/Dolibarr/dolibarr/commit/9a08a6bf6d62415ef8efa1d6e573000dee7ee203
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/categories/traduction.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contact/card.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/install/mysql/data/llx_c_units.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/products.lang
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge branch '10.0' of address@hidden:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
Commit: 07c1a5717e4e01a26e12533ddffaea0685371db6
https://github.com/Dolibarr/dolibarr/commit/07c1a5717e4e01a26e12533ddffaea0685371db6
Author: Laurent Destailleur <address@hidden>
Date: 2019-12-23 (Mon, 23 Dec 2019)
Changed paths:
M htdocs/admin/facture_situation.php
M htdocs/categories/traduction.php
M htdocs/compta/cashcontrol/cashcontrol_card.php
M htdocs/compta/cashcontrol/cashcontrol_list.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/invoicetemplate_list.php
M htdocs/compta/prelevement/bons.php
M htdocs/contact/card.php
M htdocs/core/class/CMailFile.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formmargin.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/commonfieldsinexport.inc.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modProduct.class.php
M htdocs/core/modules/modSociete.class.php
M htdocs/core/modules/modUser.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/exports/class/export.class.php
M htdocs/exports/export.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/imports/import.php
M htdocs/install/mysql/data/llx_c_units.sql
M htdocs/install/mysql/migration/6.0.0-7.0.0.sql
M htdocs/langs/en_US/bills.lang
M htdocs/langs/en_US/cashdesk.lang
M htdocs/langs/en_US/companies.lang
M htdocs/langs/en_US/products.lang
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
M htdocs/modulebuilder/template/core/modules/modMyModule.class.php
M htdocs/salaries/stats/index.php
M htdocs/takepos/takepos.php
M htdocs/theme/eldy/global.inc.php
M htdocs/theme/eldy/theme_vars.inc.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge branch '11.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/e1446d10d567...07c1a5717e4e