Francis Appels
2b193a2f42
Merge remote-tracking branch 'upstream/develop' into develop
2013-12-10 23:20:57 +01:00
Francis Appels
6b6a519afd
fix sql error create commande
...
While testing on an azure website I encountered a sql error on create
commande.
azure uses cleardb with mysql version 5.5.21-log
2013-12-10 23:10:42 +01:00
Laurent Destailleur
18592989aa
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 22:59:56 +01:00
Laurent Destailleur
eabbff3cd3
Fix: We should not load stock details at each product fetch
2013-12-10 22:59:51 +01:00
Laurent Destailleur
be3dd26672
Mark file as bugged (seriously)
2013-12-10 22:59:45 +01:00
Laurent Destailleur
ccba895e70
Fix: sql where on an int must not contains '
2013-12-10 22:59:40 +01:00
Laurent Destailleur
3fb3b109f8
Fix: Missing db transaction
2013-12-10 22:59:33 +01:00
Laurent Destailleur
6aba72e061
Better detection of corrupted module files.
2013-12-10 22:59:28 +01:00
Laurent Destailleur
1986a8db91
New: Add path file of trigger into admin trigger list page
2013-12-10 22:59:22 +01:00
Laurent Destailleur
68caa9e84a
Sync from transifex
2013-12-10 22:59:13 +01:00
Laurent Destailleur
f4880f6a85
Fix: checkstyle
2013-12-10 22:59:01 +01:00
Marcos García de La Fuente
012dde80d3
Added missing translations for permissions of margins module
2013-12-10 22:58:55 +01:00
Laurent Destailleur
884a9ddb79
Fix: Test must never be done on a translated string
2013-12-10 22:58:50 +01:00
Laurent Destailleur
a0fab45551
Comment
2013-12-10 22:58:45 +01:00
Laurent Destailleur
25e93dc605
Update ignore file
2013-12-10 22:58:39 +01:00
Laurent Destailleur
6890c26dd9
Remove <<<<
2013-12-10 22:58:34 +01:00
Laurent Destailleur
97843cbddb
Fix: Error management with corrupted module files
2013-12-10 22:58:28 +01:00
damien clochard
56162496a6
bug #1179
...
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...
For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
2013-12-10 22:58:23 +01:00
Laurent Destailleur
da569ea8d4
Fix: Serious pb with loading stocks. If we use product->stock_reel or
...
product->stock_warehoure[], we must call product->load_stock() after the
product->fetch().
2013-12-10 19:39:28 +01:00
Laurent Destailleur
df779086a6
Fix: We should not load stock details at each product fetch
2013-12-10 18:04:25 +01:00
Laurent Destailleur
b1e6ac5631
Mark file as bugged (seriously)
2013-12-10 17:53:12 +01:00
Laurent Destailleur
c78fc504af
Fix: sql where on an int must not contains '
2013-12-10 17:21:48 +01:00
Laurent Destailleur
7b73201f2e
Fix: Missing db transaction
2013-12-10 17:18:28 +01:00
Laurent Destailleur
c3c6588426
Better detection of corrupted module files.
2013-12-10 16:25:27 +01:00
Laurent Destailleur
65593bce34
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2013-12-10 15:51:16 +01:00
Laurent Destailleur
8fb0986303
New: Add path file of trigger into admin trigger list page
2013-12-10 15:49:57 +01:00
Laurent Destailleur
579e7f8e63
Sync from transifex
2013-12-09 09:26:48 +01:00
Laurent Destailleur
d34d1aed2e
Fix: checkstyle
2013-12-09 02:21:21 +01:00
Laurent Destailleur
95a41ca2fd
Merge pull request #1343 from marcosgdf/missing-translations
...
Added missing translations for permissions of margins module
2013-12-08 17:01:38 -08:00
Laurent Destailleur
f36354234d
Merge pull request #1339 from daamien/patch-1
...
bug #1179
2013-12-08 16:48:52 -08:00
Marcos García de La Fuente
02036af782
Added missing translations for permissions of margins module
2013-12-08 21:18:01 +02:00
Laurent Destailleur
b0e18348d9
Fix: Test must never be done on a translated string
2013-12-08 16:39:47 +01:00
Laurent Destailleur
3c0c9019b5
Comment
2013-12-08 15:40:22 +01:00
Laurent Destailleur
9b779e8ed8
Update ignore file
2013-12-08 15:09:35 +01:00
Laurent Destailleur
4d44f93c98
Remove <<<<
2013-12-08 12:01:59 +01:00
Laurent Destailleur
a90f6ef368
Fix: Error management with corrupted module files
2013-12-08 02:32:04 +01:00
damien clochard
c36ba2a8ea
bug #1179
...
if there's a delivery date (date_livraison) then use it instead of the validation date (date_valid) to check if we need to display a warning or not...
For example, if we are in Septembre and there's an order that was validated in june but its delivery date is set to november then a warning is not necessary, since there's nothing to do but wait for the order to be delivered.
2013-12-06 13:08:30 +01:00
Laurent Destailleur
4d9712ea4c
Merge pull request #1318 from csalvador/develop-fichinterPDF
...
Develop fichinter pdf
2013-12-04 09:41:13 -08:00
Laurent Destailleur
202c6b728e
Fix: Useless css styles make jmobile wrong
2013-12-03 20:53:39 +01:00
Laurent Destailleur
01c91c7194
Fix: Missing translation and missing comments
2013-12-03 20:44:31 +01:00
Laurent Destailleur
97e6acccde
Merge pull request #1336 from atm-alexis/develop
...
Error on mercure bill's number function.
2013-12-03 09:02:47 -08:00
Alexis Algoud
38c7c609bc
Error on mercure bill's number function.
...
Ex draft bill for november :
mask = FC{yy}{mm}{000@99}
{mm} = 11
On validation, number -> FC131160 instead of FC131112
2013-12-02 11:42:39 +01:00
Laurent Destailleur
f45a31969b
Fix regression
2013-12-02 05:52:41 +01:00
Laurent Destailleur
c475346248
Fix: [ bug #1166 ] Supplier account number in its card does not respect
...
order set in Banks module.
2013-12-01 23:16:18 +01:00
Laurent Destailleur
f7d855f4ce
Fix: [ bug #1171 ] Documents lost in interventions after validating
2013-12-01 21:03:12 +01:00
Laurent Destailleur
ad9e7b8593
Fix: [ bug #1075 ] POS module doesn't decrement stock of products in
...
Delayed payment mode.
2013-12-01 20:12:47 +01:00
Laurent Destailleur
9f251a7838
Fix: Currency is not visible
2013-12-01 19:59:01 +01:00
Laurent Destailleur
e9e94b9e47
Fix: Alignement
2013-12-01 19:39:21 +01:00
Laurent Destailleur
27c6b30651
Fix: Control on minimum amount must be one only on standard and
...
replacement invoices.
2013-12-01 18:56:20 +01:00
Laurent Destailleur
6e96d60c6c
Fix: No limits for drafts lists
2013-12-01 18:53:16 +01:00
