Laurent Destailleur
6033b7dbba
Merge pull request #1347 from fappels/develop
...
fix sql error on create commande
2013-12-13 18:53:57 -08:00
Laurent Destailleur
2519f09133
Merge pull request #1345 from marcosgdf/translation-dev
...
Corrected translation
2013-12-13 18:52:48 -08:00
Laurent Destailleur
db10740e2a
Merge pull request #1344 from GPCsolutions/feature/multicompanybookmarks
...
Feature/multicompanybookmarks
2013-12-13 18:52:38 -08:00
Laurent Destailleur
eaf151d7f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
2013-12-14 03:13:46 +01:00
Laurent Destailleur
7af5cc18bc
Sync from transifex
2013-12-14 03:09:51 +01:00
Laurent Destailleur
684be44846
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 02:57:43 +01:00
Laurent Destailleur
4d84fc46a4
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
build/makepack-dolibarr.pl
2013-12-14 02:56:23 +01:00
Laurent Destailleur
1f3f6cc7b8
Fix: Avoid to have external package into standard distribution
2013-12-14 02:55:12 +01:00
Laurent Destailleur
c94083b56e
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:33:44 +01:00
Laurent Destailleur
873f4b902d
Fix: W3C. No form into table. Make some browsers crazy.
2013-12-14 02:31:06 +01:00
Laurent Destailleur
42f032ded3
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-14 01:30:15 +01:00
Laurent Destailleur
b83f664ced
Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4
2013-12-14 01:29:24 +01:00
Laurent Destailleur
88aa0ad4da
Fix: Doxygen problems
2013-12-14 01:28:59 +01:00
Laurent Destailleur
9af2ac1afa
Sync from transifex
2013-12-14 01:05:33 +01:00
Laurent Destailleur
5cd6c05384
Fix: Uniformize amounts
2013-12-14 00:31:29 +01:00
Laurent Destailleur
8d872ab4fb
Uniformize code and more comments
2013-12-14 00:24:43 +01:00
Laurent Destailleur
c51fa7048c
Fix: text must not be encoded when provided as data of a function.
2013-12-13 21:12:18 +01:00
Laurent Destailleur
2f5932026e
More information returned into return code
2013-12-13 18:33:05 +01:00
Laurent Destailleur
14f85dc8f1
Revert "Sync from transifex"
...
This reverts commit 579e7f8e63
2013-12-13 17:50:28 +01:00
Laurent Destailleur
9a07f31a8c
Doxygen
...
Bad translation
2013-12-13 17:36:43 +01:00
Laurent Destailleur
92d23b2735
Packaging rules
2013-12-12 15:37:54 +01:00
Regis Houssin
0247241277
Fix: wrong path with multicompany module
2013-12-11 12:23:36 +01:00
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
75703a03cc
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-10 21:48:22 +01:00
Laurent Destailleur
f0eb98c27a
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:42:49 +01:00
Laurent Destailleur
a6b188ed93
Fix: We should not load stock details at each product fetch
2013-12-10 19:41:45 +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
ad420bbf42
Mark file as bugged (seriously)
2013-12-10 18:56:02 +01:00
Laurent Destailleur
aa4ae60826
Fix: sql where on an int must not contains '
2013-12-10 18:54:44 +01:00
Laurent Destailleur
ce3047203f
Fix: Missing db transaction
2013-12-10 18:54:07 +01:00
Laurent Destailleur
286bdf91d4
Better detection of corrupted module files.
2013-12-10 18:52:48 +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
