[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 2f7340: Merge remote-tracking branch
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 2f7340: Merge remote-tracking branch 'refs/remotes/Dolibar... |
|
Date: |
Sun, 11 Sep 2016 17:17:24 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 2f73409360a076d96dd4ae007640c6354f24d36a
https://github.com/Dolibarr/dolibarr/commit/2f73409360a076d96dd4ae007640c6354f24d36a
Author: fappels <address@hidden>
Date: 2016-09-07 (Wed, 07 Sep 2016)
Changed paths:
M htdocs/comm/card.php
M htdocs/compta/clients.php
M htdocs/core/ajax/selectsearchbox.php
M htdocs/core/class/google.class.php
M htdocs/core/menus/standard/auguria.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/menus/standard/empty.php
M htdocs/core/search_page.php
M htdocs/expedition/list.php
M htdocs/fourn/facture/list.php
M htdocs/langs/en_US/suppliers.lang
M htdocs/main.inc.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/Dolibarr/4.0' into
4.0_debug_product_lot
Commit: 6574ebcbfff349edb806ce46aa1f1c17d95c614b
https://github.com/Dolibarr/dolibarr/commit/6574ebcbfff349edb806ce46aa1f1c17d95c614b
Author: fappels <address@hidden>
Date: 2016-09-07 (Wed, 07 Sep 2016)
Changed paths:
M htdocs/product/stock/class/productlot.class.php
Log Message:
-----------
Replace non existing ref parameter
Replace non existing ref parameter with product_id and batch to fetch a
specific batch from a product.
Remove unused sceleton methods.
Commit: 7c772b7608ef0f18c9286960612e4ecdf8ec95c1
https://github.com/Dolibarr/dolibarr/commit/7c772b7608ef0f18c9286960612e4ecdf8ec95c1
Author: fappels <address@hidden>
Date: 2016-09-07 (Wed, 07 Sep 2016)
Changed paths:
M htdocs/expedition/class/expedition.class.php
Log Message:
-----------
Fix insert expeditiondet_batch with extrafield
Line id of extraflied was used iso expeditiondet
Commit: 5de88f6af1f1c74d4088bc816c53fefc4a05a2ed
https://github.com/Dolibarr/dolibarr/commit/5de88f6af1f1c74d4088bc816c53fefc4a05a2ed
Author: Regis Houssin <address@hidden>
Date: 2016-09-08 (Thu, 08 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix: increase max-width when use externals modules
Commit: b5db70342bfd94a27c904f355d73b6e251e1b6a6
https://github.com/Dolibarr/dolibarr/commit/b5db70342bfd94a27c904f355d73b6e251e1b6a6
Author: Ferran Marcet <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Fix: Search all is lost on lists when pagination or when the columns are
sorted
Commit: 4777faf49bdd70df9f99a3ffd0ce33825b0a420f
https://github.com/Dolibarr/dolibarr/commit/4777faf49bdd70df9f99a3ffd0ce33825b0a420f
Author: Ferran Marcet <address@hidden>
Date: 2016-09-09 (Fri, 09 Sep 2016)
Changed paths:
M htdocs/product/stock/list.php
Log Message:
-----------
Fix: Search all is lost on lists when pagination or when the columns are
sorted
Commit: 66cf9e333ec3b70834a21f9f3aed588fb17497e7
https://github.com/Dolibarr/dolibarr/commit/66cf9e333ec3b70834a21f9f3aed588fb17497e7
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/langs/en_US/admin.lang
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix option MAIN_BUTTON_HIDE_UNAUTHORIZED
Commit: c28a62e05123e7f12d2f3df201ada4db030fab33
https://github.com/Dolibarr/dolibarr/commit/c28a62e05123e7f12d2f3df201ada4db030fab33
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: d821df070b0a81e10184c1b34a6b237d65113871
https://github.com/Dolibarr/dolibarr/commit/d821df070b0a81e10184c1b34a6b237d65113871
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/cron/class/cronjob.class.php
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
Fix multicompany: recurring invoice must be in same env than template.
Commit: 7c9996c840ee48b8b576e5cb6ff7eb2b74c24810
https://github.com/Dolibarr/dolibarr/commit/7c9996c840ee48b8b576e5cb6ff7eb2b74c24810
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/compta/facture/class/facture.class.php
Log Message:
-----------
Fix when creating recurring invoice, date next gen was not set
Commit: 41545e0d606d8cbcc1aa2f4ede6ef12b7832db7e
https://github.com/Dolibarr/dolibarr/commit/41545e0d606d8cbcc1aa2f4ede6ef12b7832db7e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/compta/facture/class/facture-rec.class.php
Log Message:
-----------
Fix compatibility of recurring invoices with postgresql
Commit: 8d3adfd1c9b17782de77156c622c7aa219703cb4
https://github.com/Dolibarr/dolibarr/commit/8d3adfd1c9b17782de77156c622c7aa219703cb4
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
Fix
Commit: e10c89fba8b01b7845ce2036aa59d497efd0097d
https://github.com/Dolibarr/dolibarr/commit/e10c89fba8b01b7845ce2036aa59d497efd0097d
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
More log to help debug
Commit: 3ecc82b770d3bb5075b3afaa6ce0bc79abee3688
https://github.com/Dolibarr/dolibarr/commit/3ecc82b770d3bb5075b3afaa6ce0bc79abee3688
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/user/card.php
Log Message:
-----------
Fix error message not reported
Commit: 87fb00c293871ab62c238ccde6c1fb1e8628425e
https://github.com/Dolibarr/dolibarr/commit/87fb00c293871ab62c238ccde6c1fb1e8628425e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
Log Message:
-----------
Merge pull request #5727 from fmarcet/3.9
Fix: Search all is lost on lists when pagination or when the columns…
Commit: f5884999a9984b2f5e75c8020c8f470b65481c61
https://github.com/Dolibarr/dolibarr/commit/f5884999a9984b2f5e75c8020c8f470b65481c61
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge pull request #5716 from hregis/3.9_bug
Fix: increase max-width when use externals modules
Commit: 915340019579f777d6a61043aa80b1b97cfa9f9b
https://github.com/Dolibarr/dolibarr/commit/915340019579f777d6a61043aa80b1b97cfa9f9b
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/expedition/class/expedition.class.php
M htdocs/product/stock/class/productlot.class.php
Log Message:
-----------
Merge pull request #5710 from fappels/4.0_debug_product_lot
FIX create shipment with lot and extrafield
Commit: 530ae91e82b14bd552b19a365fd609675a985c36
https://github.com/Dolibarr/dolibarr/commit/530ae91e82b14bd552b19a365fd609675a985c36
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/supplier_proposal/note.php
Log Message:
-----------
Fix missing information on main supplier proposal card, not on note tab.
Commit: 399addebfbca5513f0eaca345db86cdba12229ba
https://github.com/Dolibarr/dolibarr/commit/399addebfbca5513f0eaca345db86cdba12229ba
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/fichinter/list.php
Log Message:
-----------
FIX alignement of intervention status
Commit: 926e3fc6f989b5a26756c5e83ab58d5618372d41
https://github.com/Dolibarr/dolibarr/commit/926e3fc6f989b5a26756c5e83ab58d5618372d41
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Fix date must be with standard format
Commit: 79f19f5c66349880c26c77a25f3605c86fa13db6
https://github.com/Dolibarr/dolibarr/commit/79f19f5c66349880c26c77a25f3605c86fa13db6
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-10 (Sat, 10 Sep 2016)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
Log Message:
-----------
Fix missing a filter billed=0 into link of billable orders
Commit: 9709c8bbbf0cb572cc6509fcc59af9701230aeab
https://github.com/Dolibarr/dolibarr/commit/9709c8bbbf0cb572cc6509fcc59af9701230aeab
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-11 (Sun, 11 Sep 2016)
Changed paths:
M htdocs/fourn/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX inversion customer/supplier price
Commit: 08dc7ade3b7840d594638e4e36f78de8af407ea1
https://github.com/Dolibarr/dolibarr/commit/08dc7ade3b7840d594638e4e36f78de8af407ea1
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-11 (Sun, 11 Sep 2016)
Changed paths:
M htdocs/fourn/card.php
M htdocs/fourn/product/list.php
Log Message:
-----------
Fix list of supplier price must show price compared to quantity.
Commit: 1bb278a5872a8a6a03318c31d321788f681bf41e
https://github.com/Dolibarr/dolibarr/commit/1bb278a5872a8a6a03318c31d321788f681bf41e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-11 (Sun, 11 Sep 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Fix #5712
Commit: 828fe984e88cbbe29adb1d48a35f496b63a3c870
https://github.com/Dolibarr/dolibarr/commit/828fe984e88cbbe29adb1d48a35f496b63a3c870
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
Log Message:
-----------
FIX #5734
Commit: 4ea50689665194669359230461e511299a815e46
https://github.com/Dolibarr/dolibarr/commit/4ea50689665194669359230461e511299a815e46
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/product/stock/list.php
Log Message:
-----------
FIX Clean of search fields
Commit: c71fc189421918c636a57d58c688dc7755608b29
https://github.com/Dolibarr/dolibarr/commit/c71fc189421918c636a57d58c688dc7755608b29
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/langs/en_US/orders.lang
Log Message:
-----------
NEW Checkbox 'close order to "Everything received" automatically if all
products are received' is visible on supplier orders.
Commit: da41c3ffa7935c8c7de108f9838d9003eb93e454
https://github.com/Dolibarr/dolibarr/commit/da41c3ffa7935c8c7de108f9838d9003eb93e454
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix better fix to increase size of login_block to allow external icon.
Commit: 1fbf233f9531a22922a4f677185041038388a85e
https://github.com/Dolibarr/dolibarr/commit/1fbf233f9531a22922a4f677185041038388a85e
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/commande/list.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/list.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/expedition/list.php
htdocs/expensereport/list.php
htdocs/fichinter/list.php
htdocs/fourn/commande/list.php
htdocs/product/reassort.php
htdocs/product/reassortlot.php
htdocs/product/stock/list.php
htdocs/societe/list.php
htdocs/supplier_proposal/list.php
htdocs/theme/eldy/style.css.php
Commit: 9ff1809f850be989e8e45886d11d9006f1e63dea
https://github.com/Dolibarr/dolibarr/commit/9ff1809f850be989e8e45886d11d9006f1e63dea
Author: Laurent Destailleur <address@hidden>
Date: 2016-09-12 (Mon, 12 Sep 2016)
Changed paths:
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture.php
M htdocs/compta/facture/class/facture-rec.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/contact/list.php
M htdocs/contrat/list.php
M htdocs/core/class/html.form.class.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/cron/class/cronjob.class.php
M htdocs/expedition/class/expedition.class.php
M htdocs/expedition/list.php
M htdocs/expensereport/list.php
M htdocs/fichinter/list.php
M htdocs/fourn/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/commande/list.php
M htdocs/fourn/product/list.php
M htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
M htdocs/langs/en_US/admin.lang
M htdocs/product/ajax/products.php
M htdocs/product/class/product.class.php
M htdocs/product/reassort.php
M htdocs/product/reassortlot.php
M htdocs/product/stock/class/productlot.class.php
M htdocs/product/stock/list.php
M htdocs/societe/list.php
M htdocs/supplier_proposal/card.php
M htdocs/supplier_proposal/list.php
M htdocs/supplier_proposal/note.php
M htdocs/theme/eldy/style.css.php
M htdocs/user/card.php
M scripts/cron/cron_run_jobs.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/1522d6060d31...9ff1809f850b