[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 4751c5: Merge pull request #4881 from
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 4751c5: Merge pull request #4881 from hregis/3.8_fix_merge |
|
Date: |
Thu, 07 Apr 2016 11:02:11 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 4751c5ac67571631add421e8eecc22710ad7f35a
https://github.com/Dolibarr/dolibarr/commit/4751c5ac67571631add421e8eecc22710ad7f35a
Author: Juanjo Menent <address@hidden>
Date: 2016-03-23 (Wed, 23 Mar 2016)
Changed paths:
M ChangeLog
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4881 from hregis/3.8_fix_merge
Fix: 3.7-3.8 fix merge
Commit: 00bf8caa8caef6c77599a70480e998c92da210c6
https://github.com/Dolibarr/dolibarr/commit/00bf8caa8caef6c77599a70480e998c92da210c6
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
FIX #4870
Commit: 08970e67d72f23d8cfd063da91b543763e118ff4
https://github.com/Dolibarr/dolibarr/commit/08970e67d72f23d8cfd063da91b543763e118ff4
Author: philippe grand <address@hidden>
Date: 2016-03-25 (Fri, 25 Mar 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
fix a lot of beug
Commit: b3285996dc4bd557580605b170c85e125c48bf8a
https://github.com/Dolibarr/dolibarr/commit/b3285996dc4bd557580605b170c85e125c48bf8a
Author: philippe grand <address@hidden>
Date: 2016-03-26 (Sat, 26 Mar 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
fix travis issue from commit 139dc9a7
Commit: 85cd818da10fc2fa3fad25be32343d968e1fb277
https://github.com/Dolibarr/dolibarr/commit/85cd818da10fc2fa3fad25be32343d968e1fb277
Author: philippe grand <address@hidden>
Date: 2016-03-27 (Sun, 27 Mar 2016)
Changed paths:
M htdocs/core/class/html.form.class.php
Log Message:
-----------
Merge branch '3.9' of https://github.com/Dolibarr/dolibarr.git into 3.9
Commit: 5d4c959d2eadd3f1c18e44f4f14f355623b91efb
https://github.com/Dolibarr/dolibarr/commit/5d4c959d2eadd3f1c18e44f4f14f355623b91efb
Author: Florian HENRY <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M htdocs/core/ajax/selectsearchbox.php
Log Message:
-----------
Add hook parameters on New search Box
Commit: f567a2a0ce3fb46c2e3b97ce451023c0938a233e
https://github.com/Dolibarr/dolibarr/commit/f567a2a0ce3fb46c2e3b97ce451023c0938a233e
Author: Florian HENRY <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M htdocs/core/ajax/selectsearchbox.php
Log Message:
-----------
Search box hook
Commit: 1419b0e385e1de0032fcc80c6f77a60556de2f46
https://github.com/Dolibarr/dolibarr/commit/1419b0e385e1de0032fcc80c6f77a60556de2f46
Author: Frédéric FRANCE <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_establishment.sql
Log Message:
-----------
Update llx_establishment.sql
Commit: 125256c825f04c641658bad3436e19016f75fe6a
https://github.com/Dolibarr/dolibarr/commit/125256c825f04c641658bad3436e19016f75fe6a
Author: Frédéric FRANCE <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
Log Message:
-----------
Update llx_usergroup_extrafields.sql
No need IF NOT EXISTS at install time
Commit: 90e74b346e7081eb998165f87afe662b12694bde
https://github.com/Dolibarr/dolibarr/commit/90e74b346e7081eb998165f87afe662b12694bde
Author: Frédéric FRANCE <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
Log Message:
-----------
Update llx_propal_merge_pdf_product.sql
No need IF NOT EXISTS at install time
Commit: 2a19326a3f6c28b7e4261ae48d35b0bec8d1fc49
https://github.com/Dolibarr/dolibarr/commit/2a19326a3f6c28b7e4261ae48d35b0bec8d1fc49
Author: Laurent Destailleur <address@hidden>
Date: 2016-03-31 (Thu, 31 Mar 2016)
Changed paths:
M htdocs/product/class/product.class.php
Log Message:
-----------
FIX Missing database escaping on supplier price insert/update
Commit: d4529d19c7bc760a9e5153ab3f632dd247a122ea
https://github.com/Dolibarr/dolibarr/commit/d4529d19c7bc760a9e5153ab3f632dd247a122ea
Author: Frédéric FRANCE <address@hidden>
Date: 2016-04-01 (Fri, 01 Apr 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Update facture.php
ref_client in order
ref_customer in shipping
Commit: 599b225489ceca826190f331a1070e8d85c0c9f3
https://github.com/Dolibarr/dolibarr/commit/599b225489ceca826190f331a1070e8d85c0c9f3
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-02 (Sat, 02 Apr 2016)
Changed paths:
M htdocs/core/lib/files.lib.php
Log Message:
-----------
FIX Creation of thumb image for size "small" was not done.
Conflicts:
htdocs/core/lib/files.lib.php
Commit: cea48a8dd6a1f269501234428755c1fcb71ca5fc
https://github.com/Dolibarr/dolibarr/commit/cea48a8dd6a1f269501234428755c1fcb71ca5fc
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-03 (Sun, 03 Apr 2016)
Changed paths:
M htdocs/comm/action/card.php
M htdocs/core/ajax/contacts.php
M htdocs/core/class/html.formactions.class.php
Log Message:
-----------
FIX bad translation language loaded
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
Commit: fded7d3e9a37dff9f15b740be76aeffc75e56dbb
https://github.com/Dolibarr/dolibarr/commit/fded7d3e9a37dff9f15b740be76aeffc75e56dbb
Author: Marcos García <address@hidden>
Date: 2016-04-03 (Sun, 03 Apr 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Corrected PHP documentation of calcul_price_total function
Commit: f8fa2202ed7f26df69e89182021fa4db3eb0cc79
https://github.com/Dolibarr/dolibarr/commit/f8fa2202ed7f26df69e89182021fa4db3eb0cc79
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M htdocs/core/ajax/selectsearchbox.php
Log Message:
-----------
Merge pull request #4921 from FHenry/3.9
Add hook parameters on New search Box
Commit: 29fc94e416539ad3278dcde722bd3721aac6a76a
https://github.com/Dolibarr/dolibarr/commit/29fc94e416539ad3278dcde722bd3721aac6a76a
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_establishment.sql
Log Message:
-----------
Merge pull request #4923 from frederic34/patch-7
FIX Remove sql error when creating table llx_establishment.sql
Commit: bd4bdcea373ea5712bdb81e0100f627f20a4d22d
https://github.com/Dolibarr/dolibarr/commit/bd4bdcea373ea5712bdb81e0100f627f20a4d22d
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
Log Message:
-----------
Merge pull request #4924 from frederic34/patch-8
FIX Remove sql error when creating table llx_usergroup_extrafields.sql
Commit: f3c032ba21ecbe502169c1f5fa1a478ed9ce1935
https://github.com/Dolibarr/dolibarr/commit/f3c032ba21ecbe502169c1f5fa1a478ed9ce1935
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
Log Message:
-----------
Merge pull request #4925 from frederic34/patch-9
Update llx_propal_merge_pdf_product.sql
Commit: 30f27b6fac6c19b11aa356648f9ffbd7ae2d22aa
https://github.com/Dolibarr/dolibarr/commit/30f27b6fac6c19b11aa356648f9ffbd7ae2d22aa
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #4933 from frederic34/patch-10
FIX correctly retreive ref_customer
Commit: 21475b587df1662b3b4baaaec32fc0b9b74d4d9e
https://github.com/Dolibarr/dolibarr/commit/21475b587df1662b3b4baaaec32fc0b9b74d4d9e
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Merge pull request #4939 from marcosgdf/patch-2
Corrected PHP documentation of calcul_price_total function
Commit: 43165bab022798c2e06bda2e678db0cb7a72cfc7
https://github.com/Dolibarr/dolibarr/commit/43165bab022798c2e06bda2e678db0cb7a72cfc7
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-04 (Mon, 04 Apr 2016)
Changed paths:
M dev/skeletons/skeleton_list.php
M htdocs/contact/list.php
M htdocs/core/class/html.form.class.php
M htdocs/product/list.php
M htdocs/projet/list.php
M htdocs/projet/tasks/list.php
M htdocs/societe/list.php
M htdocs/user/index.php
Log Message:
-----------
FIX Filter/search on extrafields on lists
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
Commit: e7adae13ca347eb20d280ebaa40ebc0753f8eb20
https://github.com/Dolibarr/dolibarr/commit/e7adae13ca347eb20d280ebaa40ebc0753f8eb20
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/install/mysql/tables/llx_actioncomm.sql
Log Message:
-----------
Code comment
Commit: 10df0e33d420c462c066c0c33d755009eff6fd09
https://github.com/Dolibarr/dolibarr/commit/10df0e33d420c462c066c0c33d755009eff6fd09
Author: Juanjo Menent <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
Merge pull request #4896 from grandoc/3.9
fix a lot of beug
Commit: d3794bb145d04ad954b197c5e6e5dbac959dd73e
https://github.com/Dolibarr/dolibarr/commit/d3794bb145d04ad954b197c5e6e5dbac959dd73e
Author: fmarcet <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
FIX: Not removing code into vatrate.
Commit: ed0ab05b93acc836f08c76871f6bb0682e1b1bd9
https://github.com/Dolibarr/dolibarr/commit/ed0ab05b93acc836f08c76871f6bb0682e1b1bd9
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modPropale.class.php
Log Message:
-----------
FIX Damn, where was the project ref ?
Commit: dd87195a0790a8d93752e4fadf0bc53db83ed389
https://github.com/Dolibarr/dolibarr/commit/dd87195a0790a8d93752e4fadf0bc53db83ed389
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 3.9
Commit: f9d7c27bd2c1b4123cdb4feff1fddd7f61be65c1
https://github.com/Dolibarr/dolibarr/commit/f9d7c27bd2c1b4123cdb4feff1fddd7f61be65c1
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/core/modules/modFicheinter.class.php
Log Message:
-----------
FIX Export must use a left join to not loose lines
Commit: 8bdda8580178acffb0d80004dee5483a499c68d3
https://github.com/Dolibarr/dolibarr/commit/8bdda8580178acffb0d80004dee5483a499c68d3
Author: Juanjo Menent <address@hidden>
Date: 2016-04-05 (Tue, 05 Apr 2016)
Changed paths:
M htdocs/contrat/class/contrat.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
Log Message:
-----------
Merge pull request #4955 from fmarcet/3.9
FIX: Not removing code into vatrate.
Commit: a43a0a3f4c0f3805b7b8108e7ca5c395053d3922
https://github.com/Dolibarr/dolibarr/commit/a43a0a3f4c0f3805b7b8108e7ca5c395053d3922
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths:
M ChangeLog
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modLoan.class.php
M htdocs/langs/en_US/loan.lang
M htdocs/loan/calc.php
M htdocs/loan/card.php
M htdocs/loan/note.php
Log Message:
-----------
Debug module loan and disable non working features
Commit: 4e3985fbc5569252651d839a105dc149dbe3288e
https://github.com/Dolibarr/dolibarr/commit/4e3985fbc5569252651d839a105dc149dbe3288e
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths:
M htdocs/admin/modules.php
Log Message:
-----------
NEW If option to see non stable modules is on, add a filter into module
list to filter on level (deprecated, experimental, development)
Commit: 1a1dc39a6b4f46b97d3602efc02bced56690b8a7
https://github.com/Dolibarr/dolibarr/commit/1a1dc39a6b4f46b97d3602efc02bced56690b8a7
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/core/class/html.formfile.class.php
Log Message:
-----------
Mark a duplicate function as deprecated
Commit: ee53a8b1a89f1a3108d648bc4c9935fa8c36077f
https://github.com/Dolibarr/dolibarr/commit/ee53a8b1a89f1a3108d648bc4c9935fa8c36077f
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-06 (Wed, 06 Apr 2016)
Changed paths:
M htdocs/admin/modules.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
NEW Can filter modules on publisher
Commit: 2c829e7cb6b5d847e4fd40505a01f181718a5979
https://github.com/Dolibarr/dolibarr/commit/2c829e7cb6b5d847e4fd40505a01f181718a5979
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/admin/modules.php
M htdocs/core/lib/functions.lib.php
A htdocs/theme/eldy/img/credit_card.png
A htdocs/theme/eldy/img/external.png
R htdocs/theme/eldy/img/object_energie.png
A htdocs/theme/eldy/img/object_energy.png
M htdocs/theme/eldy/img/setup.png
A htdocs/theme/eldy/img/upload.png
M htdocs/theme/eldy/style.css.php
A htdocs/theme/md/img/credit_card.png
A htdocs/theme/md/img/external.png
R htdocs/theme/md/img/object_energie.png
A htdocs/theme/md/img/object_energy.png
A htdocs/theme/md/img/upload.png
M htdocs/theme/md/style.css.php
Log Message:
-----------
NEW Add picto on module list to show warning and if module is an
external module.
Commit: 059466030af21b1279a576d42019bb32da717520
https://github.com/Dolibarr/dolibarr/commit/059466030af21b1279a576d42019bb32da717520
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/core/lib/functions.lib.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
Log Message:
-----------
FIX Missing a new line into log of sent emails
Commit: 7f129d14d7e1eb33c646ee9b708d21788608d743
https://github.com/Dolibarr/dolibarr/commit/7f129d14d7e1eb33c646ee9b708d21788608d743
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/class/html.formfile.class.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/theme/eldy/style.css.php
M htdocs/theme/md/style.css.php
Log Message:
-----------
Better responsive design
Commit: 1e6152eb534cc3522c00011cfef39c5a1bf3ee87
https://github.com/Dolibarr/dolibarr/commit/1e6152eb534cc3522c00011cfef39c5a1bf3ee87
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX Missing a row when incoterm is on
Commit: 086345490d50d52304e65de91adabc3931630d86
https://github.com/Dolibarr/dolibarr/commit/086345490d50d52304e65de91adabc3931630d86
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/core/class/html.formmail.class.php
M htdocs/expedition/card.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/card.php
M htdocs/fourn/facture/card.php
M htdocs/societe/soc.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
Generalize the set of trackid for everyemail sent by dolibarr.
Commit: f7fb95cab8d88c975fdaf0439899743919823957
https://github.com/Dolibarr/dolibarr/commit/f7fb95cab8d88c975fdaf0439899743919823957
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/core/boxes/box_task.php
Log Message:
-----------
FIX Box disabled because bugged
Commit: 4092f5fa2f98319fa9fd3c0dc8aca122c50d08e8
https://github.com/Dolibarr/dolibarr/commit/4092f5fa2f98319fa9fd3c0dc8aca122c50d08e8
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: 39b61d6924b026a6175fd30eeecb7b4e2452a3fb
https://github.com/Dolibarr/dolibarr/commit/39b61d6924b026a6175fd30eeecb7b4e2452a3fb
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/compta/facture.php
M htdocs/core/class/commonobject.class.php
M htdocs/product/class/product.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/core/boxes/box_task.php
htdocs/core/lib/files.lib.php
Commit: d7f669b91885f36f07e382aab8fd3beb62764ea5
https://github.com/Dolibarr/dolibarr/commit/d7f669b91885f36f07e382aab8fd3beb62764ea5
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/core/class/html.formprojet.class.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: b1c21981547ab0c7cbd4e1454e6cc9cc3922a817
https://github.com/Dolibarr/dolibarr/commit/b1c21981547ab0c7cbd4e1454e6cc9cc3922a817
Author: Laurent Destailleur <address@hidden>
Date: 2016-04-07 (Thu, 07 Apr 2016)
Changed paths:
M htdocs/admin/modules.php
M htdocs/comm/action/card.php
M htdocs/compta/facture.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/ajax/contacts.php
M htdocs/core/ajax/selectsearchbox.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/DolibarrModules.class.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/modCommande.class.php
M htdocs/core/modules/modFacture.class.php
M htdocs/core/modules/modFicheinter.class.php
M htdocs/core/modules/modPropale.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/install/mysql/tables/llx_establishment.sql
M htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
M htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
M htdocs/product/class/product.class.php
M htdocs/societe/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/b59b75801634...b1c21981547a
- [Dolibarr-git] [Dolibarr/dolibarr] 4751c5: Merge pull request #4881 from hregis/3.8_fix_merge,
Laurent Destailleur <=