[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 5b5f96: NEW : measuring unit dictionn
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 5b5f96: NEW : measuring unit dictionnary and product size/... |
Date: |
Wed, 13 Feb 2019 07:36:36 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 5b5f96bafb6ca31e8c15c0a2aa023c51c8860404
https://github.com/Dolibarr/dolibarr/commit/5b5f96bafb6ca31e8c15c0a2aa023c51c8860404
Author: florian HENRY <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modProduct.class.php
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/products.lang
M htdocs/product/class/html.formproduct.class.php
Log Message:
-----------
NEW : measuring unit dictionnary and product size/unit import
Commit: eba4be2335c67880d93193f8e01c0cbd74bb6da2
https://github.com/Dolibarr/dolibarr/commit/eba4be2335c67880d93193f8e01c0cbd74bb6da2
Author: florian HENRY <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
A htdocs/core/class/cmeasuringunits.class.php
A htdocs/core/class/cunits.class.php
A htdocs/install/mysql/data/llx_c_measuring_units.sql
A htdocs/install/mysql/tables/llx_c_measuring_units.key.sql
A htdocs/install/mysql/tables/llx_c_measuring_units.sql
Log Message:
-----------
ad missing files
Commit: 914de5e08981d7f9f0e7819e39eb55b87c8775f5
https://github.com/Dolibarr/dolibarr/commit/914de5e08981d7f9f0e7819e39eb55b87c8775f5
Author: florian HENRY <address@hidden>
Date: 2019-02-12 (Tue, 12 Feb 2019)
Changed paths:
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
Log Message:
-----------
fix mùigration script
Commit: d88475c61a5a441e7f395ddd43714b5c73dbe061
https://github.com/Dolibarr/dolibarr/commit/d88475c61a5a441e7f395ddd43714b5c73dbe061
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M dev/setup/codesniffer/ruleset.xml
M htdocs/compta/bank/various_payment/card.php
M htdocs/compta/paiement/list.php
M htdocs/compta/resultat/index.php
M htdocs/compta/resultat/result.php
M htdocs/compta/salaries/list.php
M htdocs/compta/salaries/stats/index.php
M htdocs/compta/sociales/card.php
M htdocs/compta/sociales/list.php
M htdocs/compta/sociales/payments.php
M htdocs/compta/stats/byratecountry.php
M htdocs/compta/stats/cabyprodserv.php
M htdocs/compta/stats/cabyuser.php
M htdocs/compta/stats/casoc.php
M htdocs/compta/stats/index.php
M htdocs/compta/tva/clients.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/modules/fichinter/modules_fichinter.php
M htdocs/main.inc.php
M htdocs/margin/agentMargins.php
A htdocs/product/stock/movement_card.php
Log Message:
-----------
Merge branch 'develop' of local repository into
dev_importproduct_measuringunit
Commit: 5c059c897d6aad8483869d81239ff8e084ea354f
https://github.com/Dolibarr/dolibarr/commit/5c059c897d6aad8483869d81239ff8e084ea354f
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/compta/compta-files.php
M htdocs/contact/consumption.php
M htdocs/core/class/cmeasuringunits.class.php
M htdocs/core/class/commondocgenerator.class.php
M htdocs/core/class/cunits.class.php
M htdocs/core/lib/product.lib.php
M htdocs/margin/agentMargins.php
M htdocs/product/stock/movement_card.php
M htdocs/projet/tasks/time.php
M htdocs/resource/class/html.formresource.class.php
M htdocs/webservices/server_category.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
fix travis (mosty for dev no conerne by my changes)
Commit: e2d13c0e1f9f3fe3633a0213c03f34807d3209b9
https://github.com/Dolibarr/dolibarr/commit/e2d13c0e1f9f3fe3633a0213c03f34807d3209b9
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/admin/menus/edit.php
M htdocs/compta/charges/index.php
M htdocs/compta/compta-files.php
M htdocs/contact/consumption.php
M htdocs/core/lib/treeview.lib.php
M htdocs/don/class/don.class.php
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
M htdocs/install/mysql/data/llx_00_c_country.sql
M htdocs/install/mysql/migration/8.0.0-9.0.0.sql
M htdocs/user/card.php
M htdocs/webservices/server_category.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
Commit: de87321c15ebc3771abfe214946d54a71ec44757
https://github.com/Dolibarr/dolibarr/commit/de87321c15ebc3771abfe214946d54a71ec44757
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/compta/compta-files.php
M htdocs/core/class/cmeasuringunits.class.php
M htdocs/core/lib/product.lib.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/movement_card.php
Log Message:
-----------
fix travcis
Commit: 37c66c2ece2777e483d07d63c8be75813df20285
https://github.com/Dolibarr/dolibarr/commit/37c66c2ece2777e483d07d63c8be75813df20285
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/movement_card.php
Log Message:
-----------
travis
Commit: dd9896516b3f7f18d7edb3371de7cb92cc7703d0
https://github.com/Dolibarr/dolibarr/commit/dd9896516b3f7f18d7edb3371de7cb92cc7703d0
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/admin/menus/edit.php
M htdocs/compta/compta-files.php
M htdocs/margin/agentMargins.php
M htdocs/product/stock/movement_card.php
M htdocs/projet/tasks/time.php
M htdocs/resource/class/html.formresource.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
Commit: 9caefc9483ac8ad99c5233d6c429382516a04b43
https://github.com/Dolibarr/dolibarr/commit/9caefc9483ac8ad99c5233d6c429382516a04b43
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/product/stock/movement_card.php
Log Message:
-----------
fix travis
Commit: 5bb260d3d1f2685e60cfb5768ba27e43705e1a50
https://github.com/Dolibarr/dolibarr/commit/5bb260d3d1f2685e60cfb5768ba27e43705e1a50
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/product/stock/movement_card.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit
Conflicts:
htdocs/product/stock/movement_card.php
Commit: 020fa52507e73c84f2cfaad4848127bdf5a3e4bc
https://github.com/Dolibarr/dolibarr/commit/020fa52507e73c84f2cfaad4848127bdf5a3e4bc
Author: florian HENRY <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/product/stock/movement_card.php
Log Message:
-----------
travis
Commit: 2311912d8a4f3928261eed0b8e8658ccfc55f4ac
https://github.com/Dolibarr/dolibarr/commit/2311912d8a4f3928261eed0b8e8658ccfc55f4ac
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/comm/action/class/ical.class.php
M htdocs/core/class/rssparser.class.php
M htdocs/core/lib/images.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/product/stock/movement_card.php
Log Message:
-----------
Merge branch 'develop' into dev_importproduct_measuringunit
Commit: 9f0ea65db5982d26d0190bb3e147cc4c7008360b
https://github.com/Dolibarr/dolibarr/commit/9f0ea65db5982d26d0190bb3e147cc4c7008360b
Author: Laurent Destailleur <address@hidden>
Date: 2019-02-13 (Wed, 13 Feb 2019)
Changed paths:
M htdocs/admin/dict.php
M htdocs/compta/compta-files.php
A htdocs/core/class/cmeasuringunits.class.php
A htdocs/core/class/cunits.class.php
M htdocs/core/lib/product.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/import/import_xlsx.modules.php
M htdocs/core/modules/modProduct.class.php
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/cs/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/da/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/de/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/en/uk/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/es/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fi/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/fr/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/hu/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/it/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/nl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/no/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pl/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/br/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/pt/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/ru/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/sv/config
M htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/locale/tr/config
A htdocs/install/mysql/data/llx_c_measuring_units.sql
M htdocs/install/mysql/migration/9.0.0-10.0.0.sql
A htdocs/install/mysql/tables/llx_c_measuring_units.key.sql
A htdocs/install/mysql/tables/llx_c_measuring_units.sql
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/products.lang
M htdocs/margin/agentMargins.php
M htdocs/product/class/html.formproduct.class.php
M htdocs/product/stock/movement_card.php
M htdocs/projet/tasks/time.php
M htdocs/webservices/server_category.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge pull request #10559 from atm-florian/dev_importproduct_measuringunit
NEW : measuring unit dictionary and product size/unit import
Compare:
https://github.com/Dolibarr/dolibarr/compare/69313cbf0d3e...9f0ea65db598
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 5b5f96: NEW : measuring unit dictionnary and product size/...,
Laurent Destailleur <=