[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 3940ab: FIX: select DISTINCT for natu
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 3940ab: FIX: select DISTINCT for natural search on proposa... |
|
Date: |
Wed, 18 Feb 2015 15:02:03 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 3940abe7c19744764df53eeb31f758a2f9e92dc2
https://github.com/Dolibarr/dolibarr/commit/3940abe7c19744764df53eeb31f758a2f9e92dc2
Author: Christophe Battarel <address@hidden>
Date: 2015-02-07 (Sat, 07 Feb 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
FIX: select DISTINCT for natural search on proposal list (in the same
way it's done in invoices list)
Commit: db9d727eb8a45aa3aed8cdcf2ed3568476d63733
https://github.com/Dolibarr/dolibarr/commit/db9d727eb8a45aa3aed8cdcf2ed3568476d63733
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-02-08 (Sun, 08 Feb 2015)
Changed paths:
M htdocs/compta/bank/ligne.php
Log Message:
-----------
FIX : Link to user was wrong on bank transaction card
Commit: d9ac21ab822ede55f6090c86c40eb85da1bfa2a7
https://github.com/Dolibarr/dolibarr/commit/d9ac21ab822ede55f6090c86c40eb85da1bfa2a7
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-08 (Sun, 08 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
Commit: 5747dbfe9becec1acc8acbcfd0d2d4c4bcd26b61
https://github.com/Dolibarr/dolibarr/commit/5747dbfe9becec1acc8acbcfd0d2d4c4bcd26b61
Author: Arnaud Aujon Chevallier <address@hidden>
Date: 2015-02-09 (Mon, 09 Feb 2015)
Changed paths:
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
FIXED : product webservice can now save barcode
Commit: 2483d96b331accf2ee23bfebbd46381e95748815
https://github.com/Dolibarr/dolibarr/commit/2483d96b331accf2ee23bfebbd46381e95748815
Author: KreizIT <address@hidden>
Date: 2015-02-09 (Mon, 09 Feb 2015)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
FIXED: #1829 POS not compatible with batch products
Commit: 949f9e40a083cda147619fd5b16bda347eef9f1e
https://github.com/Dolibarr/dolibarr/commit/949f9e40a083cda147619fd5b16bda347eef9f1e
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to
an object
Commit: 58a61e129498aeef2512d27351336772f98b4c7b
https://github.com/Dolibarr/dolibarr/commit/58a61e129498aeef2512d27351336772f98b4c7b
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Changed int typecast to float
Commit: a9dc6bb3d7a8797787d2016f0d9413cb2f00172c
https://github.com/Dolibarr/dolibarr/commit/a9dc6bb3d7a8797787d2016f0d9413cb2f00172c
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Fix: [ bug #1826 ] Supplier payment types are not translated in
fourn/facture/paiement.php
Commit: f1d5e1ba7b082295c7603b6ff51d2598b50e75ce
https://github.com/Dolibarr/dolibarr/commit/f1d5e1ba7b082295c7603b6ff51d2598b50e75ce
Author: aspangaro <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
FIXED Correct typo on Changelog
Commit: 6531a5c6c7d54ebce2406b697af95dec17391f28
https://github.com/Dolibarr/dolibarr/commit/6531a5c6c7d54ebce2406b697af95dec17391f28
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
Commit: 0d150b1d32af89ce1b277c5bb6dc5282a3fbe8c6
https://github.com/Dolibarr/dolibarr/commit/0d150b1d32af89ce1b277c5bb6dc5282a3fbe8c6
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/comm/action/class/ical.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/fiscalyear.lib.php
Log Message:
-----------
Removed unused code, misc corrections and corrected PHPDoc problems.
Commit: 157a6e109e2f992dd210f087d5c8e2c6a35c0780
https://github.com/Dolibarr/dolibarr/commit/157a6e109e2f992dd210f087d5c8e2c6a35c0780
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/compta/bank/class/account.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/mailmanspip/class/mailmanspip.class.php
Log Message:
-----------
Misc Adherents PHPDoc corrections
Commit: e21681a36933a81ca088d4b141801cc7814b196f
https://github.com/Dolibarr/dolibarr/commit/e21681a36933a81ca088d4b141801cc7814b196f
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/admin/agenda_other.php
M htdocs/admin/barcode.php
M htdocs/admin/ihm.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/prelevement.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/export.php
M htdocs/admin/tools/listevents.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/memory.lib.php
Log Message:
-----------
PHPDoc and misc fixes for Admin
Commit: ca939bf8a59f4e281c68c493673caee3763ffb73
https://github.com/Dolibarr/dolibarr/commit/ca939bf8a59f4e281c68c493673caee3763ffb73
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/asterisk/wrapper.php
M htdocs/barcode/codeinit.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/bookmarks/list.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/core/class/html.form.class.php
Log Message:
-----------
PHPDoc and misc fixes for several folders
Commit: 023175b9f1ced2494560cea3b6fdb9037515987e
https://github.com/Dolibarr/dolibarr/commit/023175b9f1ced2494560cea3b6fdb9037515987e
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/peruser.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/prospect/class/prospect.class.php
M htdocs/comm/remx.php
M htdocs/core/class/html.form.class.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/societe/class/address.class.php
Log Message:
-----------
PHPDoc and misc fixes for several folders
Commit: 0d6d98b3959cc8f565e22d630dcb486bec492b52
https://github.com/Dolibarr/dolibarr/commit/0d6d98b3959cc8f565e22d630dcb486bec492b52
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.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/impayees.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/quadri.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/lib/trip.lib.php
Log Message:
-----------
PHPDoc and misc fixes for several folders
Commit: 863c1f7a13cd73b4d1ee56a62ddf3bfc1338ff13
https://github.com/Dolibarr/dolibarr/commit/863c1f7a13cd73b4d1ee56a62ddf3bfc1338ff13
Author: Arnaud Aujon Chevallier <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
fix typo in createOrder
Commit: 530186c59d78ed847014c9cb17a601d80dd6ebe3
https://github.com/Dolibarr/dolibarr/commit/530186c59d78ed847014c9cb17a601d80dd6ebe3
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/contact/class/contact.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
Log Message:
-----------
PHPDoc and misc fixes for several folders
Commit: e485dd413dc3795e7fd86ccdd59edb1008646075
https://github.com/Dolibarr/dolibarr/commit/e485dd413dc3795e7fd86ccdd59edb1008646075
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/core/lib/cron.lib.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/htmlecm.form.class.php
Log Message:
-----------
PHPDoc and misc fixes for several folders
Commit: 2820bd24ac17495e00878911c57cbd38b6788d60
https://github.com/Dolibarr/dolibarr/commit/2820bd24ac17495e00878911c57cbd38b6788d60
Author: jean <address@hidden>
Date: 2015-02-10 (Tue, 10 Feb 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
fetch must contain an left join on c_actioncom for correct function
Commit: 1f31ff338ca8dafbdc73067ba8db2a4d2398e517
https://github.com/Dolibarr/dolibarr/commit/1f31ff338ca8dafbdc73067ba8db2a4d2398e517
Author: jean <address@hidden>
Date: 2015-02-11 (Wed, 11 Feb 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
correction for fetch sql
Commit: be56f767439fd89541fc6adea2ab02d2f48065fd
https://github.com/Dolibarr/dolibarr/commit/be56f767439fd89541fc6adea2ab02d2f48065fd
Author: Gauthier <address@hidden>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
Log Message:
-----------
FIX : Display error on dispatched quantity when we have several times same
product in a supplier order
Commit: 105e024c4869a51743670e31eba739b1e0bd3015
https://github.com/Dolibarr/dolibarr/commit/105e024c4869a51743670e31eba739b1e0bd3015
Author: Gauthier <address@hidden>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
Log Message:
-----------
@param desc
Commit: ebdb96b18cb699f360c773fb87d5b1fe51872c53
https://github.com/Dolibarr/dolibarr/commit/ebdb96b18cb699f360c773fb87d5b1fe51872c53
Author: aspangaro <address@hidden>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
Commit: 3d020056e09b6fd6909ca25246a72a928abf845f
https://github.com/Dolibarr/dolibarr/commit/3d020056e09b6fd6909ca25246a72a928abf845f
Author: aspangaro <address@hidden>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M htdocs/langs/fr_FR/compta.lang
Log Message:
-----------
FIXED Remove old language key
Commit: 0a1ade22c881fc61f8157a74a5572ccb759edbe7
https://github.com/Dolibarr/dolibarr/commit/0a1ade22c881fc61f8157a74a5572ccb759edbe7
Author: Maxime Kohlhaas <address@hidden>
Date: 2015-02-17 (Tue, 17 Feb 2015)
Changed paths:
M build/makepack-dolibarr.pl
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6
Commit: 9f8bee35016fdb80af98f8bfba09ea7e2ab4d10a
https://github.com/Dolibarr/dolibarr/commit/9f8bee35016fdb80af98f8bfba09ea7e2ab4d10a
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge pull request #2331 from altatof/fix_natural_search
FIX: select DISTINCT for natural search on proposal list (in the same way it's
done in invoices list)
Commit: 9eb26c66deab15805f77e57d0396a440458d2258
https://github.com/Dolibarr/dolibarr/commit/9eb26c66deab15805f77e57d0396a440458d2258
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/compta/bank/ligne.php
Log Message:
-----------
Merge pull request #2336 from atm-maxime/3.6
FIX : Link to user was wrong on bank transaction card
Commit: 89b93648377c6cac9e85f111b0cd6db0836263bd
https://github.com/Dolibarr/dolibarr/commit/89b93648377c6cac9e85f111b0cd6db0836263bd
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/resultat/clientfourn.php
Log Message:
-----------
Merge pull request #2337 from marcosgdf/bug-1822
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
Commit: 8f339712ab8b58d579751ec0c30d3f5dd4608313
https://github.com/Dolibarr/dolibarr/commit/8f339712ab8b58d579751ec0c30d3f5dd4608313
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge pull request #2338 from aaujon/3.6-webservice-product-barcode
FIXED : product webservice can now save barcode
Commit: 06c90e67bbadf6e7fdbd0e70dc9c7276d707e439
https://github.com/Dolibarr/dolibarr/commit/06c90e67bbadf6e7fdbd0e70dc9c7276d707e439
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge pull request #2339 from KreizIT/fix_1829
FIXED: #1829 POS not compatible with batch products
Commit: 6d25cf6f6ab835c8547e2e7aa5d45a262de82947
https://github.com/Dolibarr/dolibarr/commit/6d25cf6f6ab835c8547e2e7aa5d45a262de82947
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch 'bug-1832' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1832
Conflicts:
ChangeLog
Commit: f831bdd2315d9da8039986763ebc880b4bc6a945
https://github.com/Dolibarr/dolibarr/commit/f831bdd2315d9da8039986763ebc880b4bc6a945
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1832' into 3.6
Commit: fc415fc3c918b83c8cdb256506ace18a1dd6cc12
https://github.com/Dolibarr/dolibarr/commit/fc415fc3c918b83c8cdb256506ace18a1dd6cc12
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Fix: [ bug #1826 ] Supplier payment types are not translated in
fourn/facture/paiement.php
Commit: 50142a1e6cdb3711f47bfef25a10419279c2bd3d
https://github.com/Dolibarr/dolibarr/commit/50142a1e6cdb3711f47bfef25a10419279c2bd3d
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge branch 'bug-1826' of https://github.com/marcosgdf/dolibarr into
3.6
Conflicts:
ChangeLog
Commit: 231c3f57d30684cd3ae9ea73a90527c6a3eb219e
https://github.com/Dolibarr/dolibarr/commit/231c3f57d30684cd3ae9ea73a90527c6a3eb219e
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
Log Message:
-----------
Merge pull request #2342 from aspangaro/3.6
FIXED Correct typo on Changelog
Commit: ead6b4bf951e862fd7f941a11220cfcefdd19e19
https://github.com/Dolibarr/dolibarr/commit/ead6b4bf951e862fd7f941a11220cfcefdd19e19
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Merge branch 'bug-1830' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1830
Conflicts:
ChangeLog
Commit: 9ebd79f52858b1928fd884a33c0686009abdd6c8
https://github.com/Dolibarr/dolibarr/commit/9ebd79f52858b1928fd884a33c0686009abdd6c8
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/compta/salaries/fiche.php
Log Message:
-----------
Merge branch 'marcosgdf-bug-1830' into 3.6
Commit: 4963555669d177ffd281d8ac83a92e55bb41f93c
https://github.com/Dolibarr/dolibarr/commit/4963555669d177ffd281d8ac83a92e55bb41f93c
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/admin/agenda_other.php
M htdocs/admin/barcode.php
M htdocs/admin/ihm.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/prelevement.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/export.php
M htdocs/admin/tools/listevents.php
M htdocs/asterisk/wrapper.php
M htdocs/barcode/codeinit.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/bookmarks/list.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/peruser.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/prospect/class/prospect.class.php
M htdocs/comm/remx.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.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/impayees.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/quadri.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/cron.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fiscalyear.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/memory.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/htmlecm.form.class.php
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/societe/class/address.class.php
Log Message:
-----------
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
Commit: 0622b3ad0835e8479bc70c63a22b27075a95d689
https://github.com/Dolibarr/dolibarr/commit/0622b3ad0835e8479bc70c63a22b27075a95d689
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/admin/agenda_other.php
M htdocs/admin/barcode.php
M htdocs/admin/ihm.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/prelevement.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/export.php
M htdocs/admin/tools/listevents.php
M htdocs/asterisk/wrapper.php
M htdocs/barcode/codeinit.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/bookmarks/list.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/peruser.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/prospect/class/prospect.class.php
M htdocs/comm/remx.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.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/impayees.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/quadri.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/cron.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fiscalyear.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/memory.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/htmlecm.form.class.php
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/societe/class/address.class.php
Log Message:
-----------
Merge branch 'marcosgdf-misc' into 3.7
Commit: 22fdcfc272114977a344dac98154ff8ca7acf9c3
https://github.com/Dolibarr/dolibarr/commit/22fdcfc272114977a344dac98154ff8ca7acf9c3
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Merge branch '3.7' of address@hidden:Dolibarr/dolibarr.git into 3.7
Commit: ceb392038143638376f60e4e34ea98fed3a52dcb
https://github.com/Dolibarr/dolibarr/commit/ceb392038143638376f60e4e34ea98fed3a52dcb
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/webservices/server_order.php
Log Message:
-----------
Merge pull request #2346 from aaujon/3.6-webservice-order
fix typo in createOrder
Commit: 2d2930b421f9d4595e488899a0589a67e8421c88
https://github.com/Dolibarr/dolibarr/commit/2d2930b421f9d4595e488899a0589a67e8421c88
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge pull request #2348 from tiaris/3.7_actionclassbug
fetch must contain an left join on c_actioncom for correct function
Commit: d7dcf28c61b0b588de1bcacfb921065d2260e30f
https://github.com/Dolibarr/dolibarr/commit/d7dcf28c61b0b588de1bcacfb921065d2260e30f
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
Log Message:
-----------
Merge branch '3.7' of https://github.com/atm-gauthier/dolibarr into
atm-gauthier-3.7
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
Commit: 6d408724f7d8965253cc0c5bb6a72983c5c99922
https://github.com/Dolibarr/dolibarr/commit/6d408724f7d8965253cc0c5bb6a72983c5c99922
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
Log Message:
-----------
Merge branch 'atm-gauthier-3.7' into 3.7
Commit: 271bcb5313f18cea631eae40313b5c41f0b92482
https://github.com/Dolibarr/dolibarr/commit/271bcb5313f18cea631eae40313b5c41f0b92482
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/accountancy/supplier/list.php
Log Message:
-----------
Merge pull request #2354 from aspangaro/3.7-patch2
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
Commit: e7d95f553bdd0038d42bad84dfb5621c284e5bae
https://github.com/Dolibarr/dolibarr/commit/e7d95f553bdd0038d42bad84dfb5621c284e5bae
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M htdocs/comm/propal/list.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.5' into 3.6
Commit: 774389940eebd889c16fa07c2b035924888f394a
https://github.com/Dolibarr/dolibarr/commit/774389940eebd889c16fa07c2b035924888f394a
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-18 (Wed, 18 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/comm/propal/list.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/card.php
M htdocs/core/lib/functions.lib.php
M htdocs/fourn/facture/paiement.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/compta/bank/ligne.php
htdocs/compta/resultat/clientfourn.php
htdocs/compta/salaries/fiche.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/facture/paiement.php
Commit: e3713c8b6d85bc2a8381ebbef1c45eca3e47b0bb
https://github.com/Dolibarr/dolibarr/commit/e3713c8b6d85bc2a8381ebbef1c45eca3e47b0bb
Author: Laurent Destailleur <address@hidden>
Date: 2015-02-19 (Thu, 19 Feb 2015)
Changed paths:
M ChangeLog
M htdocs/accountancy/admin/fiscalyear.php
M htdocs/accountancy/admin/fiscalyear_card.php
M htdocs/accountancy/class/accountancysystem.class.php
M htdocs/accountancy/class/accountingaccount.class.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/accountancy/class/html.formventilation.class.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/journal/sellsjournal.php
M htdocs/accountancy/supplier/list.php
M htdocs/adherents/admin/adherent.php
M htdocs/adherents/canvas/actions_adherentcard_common.class.php
M htdocs/adherents/card.php
M htdocs/adherents/card_subscriptions.php
M htdocs/adherents/class/adherent.class.php
M htdocs/adherents/class/adherent_type.class.php
M htdocs/adherents/list.php
M htdocs/adherents/type.php
M htdocs/admin/agenda_other.php
M htdocs/admin/barcode.php
M htdocs/admin/ihm.php
M htdocs/admin/menus.php
M htdocs/admin/menus/edit.php
M htdocs/admin/prelevement.php
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/eaccelerator.php
M htdocs/admin/tools/export.php
M htdocs/admin/tools/listevents.php
M htdocs/asterisk/wrapper.php
M htdocs/barcode/codeinit.php
M htdocs/barcode/printsheet.php
M htdocs/bookmarks/bookmarks.lib.php
M htdocs/bookmarks/list.php
M htdocs/cashdesk/admin/cashdesk.php
M htdocs/cashdesk/tpl/validation2.tpl.php
M htdocs/categories/categorie.php
M htdocs/categories/class/categorie.class.php
M htdocs/categories/photos.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/comm/action/class/cactioncomm.class.php
M htdocs/comm/action/class/ical.class.php
M htdocs/comm/action/index.php
M htdocs/comm/action/listactions.php
M htdocs/comm/action/peruser.php
M htdocs/comm/card.php
M htdocs/comm/index.php
M htdocs/comm/mailing/cibles.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/class/propalestats.class.php
M htdocs/comm/propal/list.php
M htdocs/comm/prospect/class/prospect.class.php
M htdocs/comm/remx.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/list.php
M htdocs/commande/orderstoinvoice.php
M htdocs/compta/bank/account.php
M htdocs/compta/bank/card.php
M htdocs/compta/bank/class/account.class.php
M htdocs/compta/bank/ligne.php
M htdocs/compta/bank/virement.php
M htdocs/compta/deplacement/card.php
M htdocs/compta/deplacement/class/deplacement.class.php
M htdocs/compta/dons/card.php
M htdocs/compta/dons/class/don.class.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/impayees.php
M htdocs/compta/localtax/class/localtax.class.php
M htdocs/compta/localtax/clients.php
M htdocs/compta/localtax/quadri_detail.php
M htdocs/compta/paiement.php
M htdocs/compta/paiement/cheque/card.php
M htdocs/compta/paiement/cheque/class/remisecheque.class.php
M htdocs/compta/paiement/class/paiement.class.php
M htdocs/compta/prelevement/class/bonprelevement.class.php
M htdocs/compta/prelevement/class/ligneprelevement.class.php
M htdocs/compta/prelevement/class/rejetprelevement.class.php
M htdocs/compta/resultat/clientfourn.php
M htdocs/compta/salaries/card.php
M htdocs/compta/sociales/class/chargesociales.class.php
M htdocs/compta/tva/quadri.php
M htdocs/contact/class/contact.class.php
M htdocs/contrat/card.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/doleditor.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/class/html.formcompany.class.php
M htdocs/core/class/html.formother.class.php
M htdocs/core/class/ldap.class.php
M htdocs/core/class/vcard.class.php
M htdocs/core/lib/accounting.lib.php
M htdocs/core/lib/ajax.lib.php
M htdocs/core/lib/bank.lib.php
M htdocs/core/lib/company.lib.php
M htdocs/core/lib/contact.lib.php
M htdocs/core/lib/contract.lib.php
M htdocs/core/lib/cron.lib.php
M htdocs/core/lib/emailing.lib.php
M htdocs/core/lib/fiscalyear.lib.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/member.lib.php
M htdocs/core/lib/memory.lib.php
M htdocs/core/lib/order.lib.php
M htdocs/core/lib/prelevement.lib.php
M htdocs/core/lib/tax.lib.php
M htdocs/core/lib/trip.lib.php
M htdocs/core/modules/modProductBatch.class.php
M htdocs/cron/class/cronjob.class.php
M htdocs/ecm/class/ecmdirectory.class.php
M htdocs/ecm/class/htmlecm.form.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/commande/dispatch.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/migration/3.6.0-3.7.0.sql
M htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
M htdocs/langs/en_US/admin.lang
M htdocs/mailmanspip/class/mailmanspip.class.php
M htdocs/societe/class/address.class.php
M htdocs/webservices/server_order.php
M htdocs/webservices/server_productorservice.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/25ba9d2c9771...e3713c8b6d85