Commit Graph

41539 Commits

Author SHA1 Message Date
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
Laurent Destailleur
d8cd7571ec Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-12-07 18:48:31 +01:00
Laurent Destailleur
b637b28c8b Update ignore files 2013-12-07 18:47:58 +01:00
Laurent Destailleur
0e819ab5cd Fix: Missing test 2013-12-07 16:43:35 +01:00
Laurent Destailleur
73e60e0629 Fix: Mass update of vat must work also for supplier prices
Conflicts:
	htdocs/product/admin/product_tools.php
2013-12-07 12:06:41 +01:00
Laurent Destailleur
adf55408a4 Fix: Bad parameter that duplicate info. 2013-12-07 03:23:14 +01:00
Laurent Destailleur
fa0470bdb9 Fix: Mass update of vat must work also for supplier prices 2013-12-07 02:29:24 +01:00
Laurent Destailleur
01a9b23f26 Fix: Vat rate was not set during update 2013-12-07 01:22:27 +01:00
Laurent Destailleur
62e209520a Fix: Update when submitting form 2013-12-07 00:53:58 +01:00
Laurent Destailleur
76d111b09f Fix: W3C form must be outside table tag 2013-12-07 00:26:30 +01:00
Laurent Destailleur
87db1d880b Fix: css 2013-12-06 21:03:59 +01:00