[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 14:52:09 -0800 |
Branch: refs/heads/3.7
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: 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: 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: 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: 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: 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: 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
Compare:
https://github.com/Dolibarr/dolibarr/compare/271bcb5313f1...774389940eeb