[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] e22fb3: fix : Typo
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] e22fb3: fix : Typo |
|
Date: |
Sat, 10 Oct 2015 09:56:39 -0700 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: e22fb3c538bd214cca9f97c1fb65796e9cc5d795
https://github.com/Dolibarr/dolibarr/commit/e22fb3c538bd214cca9f97c1fb65796e9cc5d795
Author: philippe grand <address@hidden>
Date: 2015-10-02 (Fri, 02 Oct 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/facture.php
M htdocs/fourn/commande/card.php
Log Message:
-----------
fix : Typo
Commit: 78cb31e55f6d00c2f9e3b968df27d50b3a176920
https://github.com/Dolibarr/dolibarr/commit/78cb31e55f6d00c2f9e3b968df27d50b3a176920
Author: philippe grand <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/comm/mailing/list.php
Log Message:
-----------
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7
Commit: c9d8e041d56a7bd5cc32681f2be8bdf0ec18fdde
https://github.com/Dolibarr/dolibarr/commit/c9d8e041d56a7bd5cc32681f2be8bdf0ec18fdde
Author: Florian HENRY <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/public/members/new.php
Log Message:
-----------
FIX : New adherent from, always redirect on entity
Commit: 9dd4a23365d7f857280d224eb1c133d3a5f9fd81
https://github.com/Dolibarr/dolibarr/commit/9dd4a23365d7f857280d224eb1c133d3a5f9fd81
Author: Florian HENRY <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/resultat/index.php
M htdocs/langs/en_US/compta.lang
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: bf262c2cae6dd7369bb830bcab3aa393789b76fe
https://github.com/Dolibarr/dolibarr/commit/bf262c2cae6dd7369bb830bcab3aa393789b76fe
Author: Christophe Battarel <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
reenable search criteria in sql clause
Commit: d24f5538f9cf1c5e0ce8b0eb7a559111f9b50963
https://github.com/Dolibarr/dolibarr/commit/d24f5538f9cf1c5e0ce8b0eb7a559111f9b50963
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Fix: wrong parameters order
Commit: 41354ca00d63888f46de15c3ae6c657b3824856d
https://github.com/Dolibarr/dolibarr/commit/41354ca00d63888f46de15c3ae6c657b3824856d
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Added type hinting to extrafields object
Commit: 3fdd59bf0a06798476566b6fc173ebb3540ef5cb
https://github.com/Dolibarr/dolibarr/commit/3fdd59bf0a06798476566b6fc173ebb3540ef5cb
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix #3666 checkbox extrafields on edit
Commit: afbee44993e6c5c6ae80f7e46f5eba72bd523fab
https://github.com/Dolibarr/dolibarr/commit/afbee44993e6c5c6ae80f7e46f5eba72bd523fab
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-10-05 (Mon, 05 Oct 2015)
Changed paths:
M htdocs/adherents/type.php
M htdocs/comm/action/card.php
Log Message:
-----------
Fix #3667 checkbox extrafields on edit
For actions and members.
Commit: c208fccf35aaf44b83bdc3edc0c2e5d5623d4b87
https://github.com/Dolibarr/dolibarr/commit/c208fccf35aaf44b83bdc3edc0c2e5d5623d4b87
Author: Raphaël Doursenaud <address@hidden>
Date: 2015-10-06 (Tue, 06 Oct 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
[Qual] Prevent warning
calcul_price_total() prefers to have the seller and localtaxes specified
Commit: 8f5d9597f8f7fc07dc5ac979fd7b1d32b29d347f
https://github.com/Dolibarr/dolibarr/commit/8f5d9597f8f7fc07dc5ac979fd7b1d32b29d347f
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-07 (Wed, 07 Oct 2015)
Changed paths:
M htdocs/adherents/type.php
M htdocs/comm/action/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #3675 from GPCsolutions/3.7-3666
Fixes for checkbox extrafields
Commit: 6cce2860c24f0605a20cde6a21fcc5a79720da5d
https://github.com/Dolibarr/dolibarr/commit/6cce2860c24f0605a20cde6a21fcc5a79720da5d
Author: philippe grand <address@hidden>
Date: 2015-10-08 (Thu, 08 Oct 2015)
Changed paths:
M htdocs/adherents/type.php
M htdocs/comm/action/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge branch '3.7' of https://github.com/Dolibarr/dolibarr.git into 3.7
Commit: 0e343ae3b2920ccd01353f2216d4d81ac0d66470
https://github.com/Dolibarr/dolibarr/commit/0e343ae3b2920ccd01353f2216d4d81ac0d66470
Author: philippe grand <address@hidden>
Date: 2015-10-08 (Thu, 08 Oct 2015)
Changed paths:
M htdocs/adherents/admin/public.php
M htdocs/adherents/card.php
M htdocs/admin/dict.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/categories/class/categorie.class.php
M htdocs/compta/bank/releve.php
M htdocs/compta/stats/index.php
M htdocs/core/lib/memory.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/livraison/card.php
M htdocs/opensurvey/card.php
M htdocs/product/composition/card.php
M htdocs/product/stock/valo.php
M htdocs/projet/note.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
M htdocs/webservices/demo_wsclient_category.php-NORUN
M htdocs/webservices/demo_wsclient_invoice.php-NORUN
M htdocs/webservices/demo_wsclient_other.php-NORUN
M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
M scripts/contracts/email_expire_services_to_representatives.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
syntax error
Commit: 53c9cb38efb1e7e0077badf7630f8870e3c78f78
https://github.com/Dolibarr/dolibarr/commit/53c9cb38efb1e7e0077badf7630f8870e3c78f78
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M htdocs/public/members/new.php
Log Message:
-----------
Merge pull request #3664 from FHenry/3.7
FIX : New adherent from, always redirect on entity
Commit: c675f88dda57b085932ba44a670af313b8f8fd79
https://github.com/Dolibarr/dolibarr/commit/c675f88dda57b085932ba44a670af313b8f8fd79
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M htdocs/comm/propal/class/propal.class.php
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Merge pull request #3678 from GPCsolutions/3.7-calcul_price_total-warning
[Qual] Prevent warning
Commit: b27989d5d488e403f3232c7ac52126d55e6d51f6
https://github.com/Dolibarr/dolibarr/commit/b27989d5d488e403f3232c7ac52126d55e6d51f6
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #3665 from altatof/fix_extrafields
reenable search criteria in sql clause
Commit: f9485bd25bd109a7998ae593a36fb21cbb65ca9c
https://github.com/Dolibarr/dolibarr/commit/f9485bd25bd109a7998ae593a36fb21cbb65ca9c
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/core/class/extrafields.class.php
Commit: 279e7028fb7a186a20dee0da39abd328f001770d
https://github.com/Dolibarr/dolibarr/commit/279e7028fb7a186a20dee0da39abd328f001770d
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-09 (Fri, 09 Oct 2015)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/public.php
M htdocs/adherents/card.php
M htdocs/admin/dict.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/categories/class/categorie.class.php
M htdocs/comm/propal.php
M htdocs/commande/card.php
M htdocs/compta/bank/releve.php
M htdocs/compta/facture.php
M htdocs/compta/stats/index.php
M htdocs/core/lib/memory.lib.php
M htdocs/core/lib/project.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/modules/import/import_csv.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/fourn/commande/card.php
M htdocs/livraison/card.php
M htdocs/opensurvey/card.php
M htdocs/product/composition/card.php
M htdocs/product/stock/valo.php
M htdocs/projet/note.php
M htdocs/societe/canvas/company/tpl/card_view.tpl.php
M htdocs/societe/canvas/individual/tpl/card_view.tpl.php
M htdocs/webservices/demo_wsclient_actioncomm.php-NORUN
M htdocs/webservices/demo_wsclient_category.php-NORUN
M htdocs/webservices/demo_wsclient_invoice.php-NORUN
M htdocs/webservices/demo_wsclient_other.php-NORUN
M htdocs/webservices/demo_wsclient_productorservice.php-NORUN
M htdocs/webservices/demo_wsclient_thirdparty.php-NORUN
M scripts/contracts/email_expire_services_to_representatives.php
M scripts/invoices/email_unpaid_invoices_to_representatives.php
Log Message:
-----------
Merge pull request #3686 from grandoc/3.7
3.7
Commit: 7b7d27920da499eb0612619043532a5af175f27a
https://github.com/Dolibarr/dolibarr/commit/7b7d27920da499eb0612619043532a5af175f27a
Author: Laurent Destailleur <address@hidden>
Date: 2015-10-10 (Sat, 10 Oct 2015)
Changed paths:
M htdocs/adherents/type.php
M htdocs/comm/action/card.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/public/members/new.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/856bfaaa3ae9...7b7d27920da4