lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,855 Commits 43 Branches 150 Tags 886 MiB
2519f09133
Commit Graph

39855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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