Laurent Destailleur
|
d7dcf28c61
|
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
|
2015-02-18 23:15:40 +01:00 |
|
Laurent Destailleur
|
2d2930b421
|
Merge pull request #2348 from tiaris/3.7_actionclassbug
fetch must contain an left join on c_actioncom for correct function
|
2015-02-18 23:02:44 +01:00 |
|
Laurent Destailleur
|
22fdcfc272
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-02-18 22:54:44 +01:00 |
|
Laurent Destailleur
|
0622b3ad08
|
Merge branch 'marcosgdf-misc' into 3.7
|
2015-02-18 22:54:16 +01:00 |
|
Laurent Destailleur
|
4963555669
|
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
|
2015-02-18 22:54:02 +01:00 |
|
Laurent Destailleur
|
06c90e67bb
|
Merge pull request #2339 from KreizIT/fix_1829
FIXED: #1829 POS not compatible with batch products
|
2015-02-18 22:38:19 +01:00 |
|
Laurent Destailleur
|
cc1d506614
|
Miscelaneous debug on barcode features.
|
2015-02-18 21:01:17 +01:00 |
|
Laurent Destailleur
|
ad67fe50a3
|
Correct management when delivery date is universal time format.
|
2015-02-17 17:21:41 +01:00 |
|
Laurent Destailleur
|
685b8d722d
|
Fix: Bad hook name
|
2015-02-17 16:46:37 +01:00 |
|
Laurent Destailleur
|
5688e8ecd8
|
Add todo to show code is missing here
|
2015-02-16 20:51:05 +01:00 |
|
Laurent Destailleur
|
1e78d0e8d4
|
New: Introduce hidden option
STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS to solve, with no risk, a
missing control on missing warehouse.
|
2015-02-16 20:46:54 +01:00 |
|
Laurent Destailleur
|
03d19bf77f
|
Fix: Sort criteria
|
2015-02-16 18:02:25 +01:00 |
|
Laurent Destailleur
|
118ae7e8f8
|
Backport fix done into dev.
|
2015-02-16 17:55:53 +01:00 |
|
Laurent Destailleur
|
3cf4b80baa
|
Fix missing test of action when using canvas
|
2015-02-16 02:02:11 +01:00 |
|
Laurent Destailleur
|
2045fb22e9
|
Lock 5.5.40
|
2015-02-15 23:39:30 +01:00 |
|
Laurent Destailleur
|
9ab48b3d90
|
Revert "Trad"
This reverts commit bb2c33e2c1.
|
2015-02-15 22:51:18 +01:00 |
|
Laurent Destailleur
|
bb2c33e2c1
|
Trad
|
2015-02-15 22:49:53 +01:00 |
|
Laurent Destailleur
|
eef1e17c61
|
Fix: default vat
|
2015-02-15 19:38:20 +01:00 |
|
Laurent Destailleur
|
11ae661303
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-02-14 14:01:18 +01:00 |
|
Laurent Destailleur
|
7cf115cc87
|
Introduce a protection to avoid migration if database has critical bugs
making data lost.
|
2015-02-14 12:26:39 +01:00 |
|
Laurent Destailleur
|
c596fa1475
|
Introduce a protection to avoid migration if database has critical bugs
making data lost.
|
2015-02-14 12:24:16 +01:00 |
|
Laurent Destailleur
|
6189db677d
|
Fix package .exe
|
2015-02-14 11:25:26 +01:00 |
|
Laurent Destailleur
|
46b1e213b9
|
Sync from transifex
|
2015-02-13 21:26:43 +01:00 |
|
Laurent Destailleur
|
206a453ce2
|
Solve confusion into number of order or qty into order.
|
2015-02-12 15:40:06 +01:00 |
|
Laurent Destailleur
|
c727e2b8ec
|
Fix bad translation
Conflicts:
htdocs/product/stock/product.php
|
2015-02-12 15:29:21 +01:00 |
|
Gauthier
|
105e024c48
|
@param desc
|
2015-02-12 13:20:03 +01:00 |
|
Gauthier
|
be56f76743
|
FIX : Display error on dispatched quantity when we have several times same product in a supplier order
|
2015-02-12 12:56:21 +01:00 |
|
Laurent Destailleur
|
17d2368bdc
|
Fix we must use short key
|
2015-02-11 15:07:20 +01:00 |
|
jean
|
1f31ff338c
|
correction for fetch sql
|
2015-02-11 14:39:32 +01:00 |
|
Laurent Destailleur
|
ddb95e5765
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
|
2015-02-10 21:33:43 +01:00 |
|
Laurent Destailleur
|
039a184d70
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
|
2015-02-10 21:13:12 +01:00 |
|
Laurent Destailleur
|
abcf4480de
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-02-10 21:02:23 +01:00 |
|
Laurent Destailleur
|
fce7a0e36e
|
Bad translation
|
2015-02-10 21:01:44 +01:00 |
|
jean
|
2820bd24ac
|
fetch must contain an left join on c_actioncom for correct function
|
2015-02-10 16:03:31 +01:00 |
|
Marcos García de La Fuente
|
e485dd413d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:41:59 +01:00 |
|
Marcos García de La Fuente
|
530186c59d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:32:00 +01:00 |
|
Marcos García de La Fuente
|
0d6d98b395
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:17:37 +01:00 |
|
Marcos García de La Fuente
|
023175b9f1
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:38:13 +01:00 |
|
Marcos García de La Fuente
|
ca939bf8a5
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:02:11 +01:00 |
|
Marcos García de La Fuente
|
e21681a369
|
PHPDoc and misc fixes for Admin
|
2015-02-10 10:52:48 +01:00 |
|
Marcos García de La Fuente
|
157a6e109e
|
Misc Adherents PHPDoc corrections
|
2015-02-10 10:45:48 +01:00 |
|
Marcos García de La Fuente
|
0d150b1d32
|
Removed unused code, misc corrections and corrected PHPDoc problems.
|
2015-02-10 10:25:59 +01:00 |
|
KreizIT
|
2483d96b33
|
FIXED: #1829 POS not compatible with batch products
|
2015-02-09 17:19:20 +01:00 |
|
Laurent Destailleur
|
24ad1afdd2
|
Merge pull request #2335 from atm-alexis/3.7
FIX empty discount where created if amount is null
|
2015-02-08 00:07:48 +01:00 |
|
Laurent Destailleur
|
2c730bf61c
|
Merge pull request #2332 from aspangaro/3.7-patch1
FIXED Review
|
2015-02-08 00:03:11 +01:00 |
|
Laurent Destailleur
|
07877bc381
|
Merge branch 'marcosgdf-bug-1827' into 3.6
|
2015-02-07 23:57:13 +01:00 |
|
Laurent Destailleur
|
e8b2b22c32
|
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1827
Conflicts:
ChangeLog
|
2015-02-07 23:56:38 +01:00 |
|
Laurent Destailleur
|
cdc3af7bbe
|
Merge pull request #2327 from aspangaro/3.7
FIXED : Lost field in migration for accountancy
|
2015-02-07 23:49:47 +01:00 |
|
Laurent Destailleur
|
d10e28db36
|
Merge pull request #2326 from aaujon/3.6-webservice-order
FIXES Webservice : fk_delivery_address not saved
|
2015-02-07 23:49:31 +01:00 |
|
Laurent Destailleur
|
6eb0d34032
|
Merge pull request #2325 from aaujon/3.6-webservices-contact
FIXED #1824 Add ref_ext for Contact webservices
|
2015-02-07 23:47:19 +01:00 |
|