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
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
Marcos García de La Fuente
02700edf22
Corrected translation
2013-12-10 14:38:34 +01:00
Marcos García de La Fuente
d226abcdfc
Corrected translation
2013-12-10 14:30:40 +01:00
Raphaël Doursenaud
0d36435018
Added missing language loads for bookmarks
2013-12-10 12:04:07 +01:00
Raphaël Doursenaud
add5a232ac
Added some security assessments to bookmarks
2013-12-10 12:01:08 +01:00
Raphaël Doursenaud
5e642f3009
Bookmarks multicompany migration
2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
071dd8e758
Make bookmarks module multicompany aware
2013-12-10 12:00:42 +01:00
Raphaël Doursenaud
d3d1863150
Removed unused file
2013-12-10 11:39:41 +01:00
Raphaël Doursenaud
5ba9a1134b
Removed dead code
2013-12-10 11:38:02 +01:00
Laurent Destailleur
a89a4ee81a
Fix: Delete vat entry when bank line was already deleted.
2013-12-09 22:39:41 +01:00
Laurent Destailleur
c49af3da48
Fix: fields too large
2013-12-09 11:00:36 +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
72250f656e
Merge remote-tracking branch 'origin/3.4' into 3.5
2013-12-09 02:17:43 +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
705192215a
Merge pull request #1341 from marcosgdf/bug-1182
...
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 16:49:50 -08:00
Laurent Destailleur
f36354234d
Merge pull request #1339 from daamien/patch-1
...
bug #1179
2013-12-08 16:48:52 -08:00
Laurent Destailleur
565fb615bc
Update gitignore
2013-12-09 01:41:48 +01:00
Laurent Destailleur
bf07bd5b24
Fix: Missing translation
2013-12-08 23:58:27 +01:00
Laurent Destailleur
f804833b9c
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
htdocs/core/modules/modFacture.class.php
2013-12-08 22:38:10 +01:00
Laurent Destailleur
825640d645
Fix: Missing special code into export
2013-12-08 21:24:59 +01:00
Marcos García de La Fuente
02036af782
Added missing translations for permissions of margins module
2013-12-08 21:18:01 +02:00
Marcos García de La Fuente
beb93e9245
Resolved bug #1182 : ODT company_country tag is htmlencoded
2013-12-08 20:23:44 +02:00
Laurent Destailleur
a05d9b864a
Fix: Test must never be done on a translated string
2013-12-08 16:40:45 +01: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
7aa2c9dcd1
Fix: Error management with corrupted module files
2013-12-08 02:33:32 +01:00
Laurent Destailleur
a90f6ef368
Fix: Error management with corrupted module files
2013-12-08 02:32:04 +01:00
Laurent Destailleur
37b0780523
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
htdocs/comm/propal.php
htdocs/ecm/tpl/builddatabase.tpl.php
htdocs/fourn/commande/liste.php
htdocs/product/admin/product_tools.php
2013-12-08 00:42:36 +01:00
