lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,390 Commits 43 Branches 150 Tags 886 MiB
f34aadef3d
Commit Graph

40390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ff5a900ea3 Work on automation of transifex 2013-05-26 14:13:49 +02:00
Laurent Destailleur
e41542a219 Start to test transifex 2013-05-26 13:57:55 +02:00
Laurent Destailleur
2e8d2b884f Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-05-26 13:31:11 +02:00
Laurent Destailleur
c66304e217 Fix: Update version 2013-05-26 13:20:37 +02:00
Florian Henry
f543f00024 Fix PGSQL Bugs 
Removing parenthesis make query works for MySQL and PgSQL
 2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222 Fix [ bug #911 ] Reorder intervention do not work 2013-05-26 10:15:43 +02:00
zcattacz
407639fcde Update translation 
- all 'invoice's are changed to bill, since there is no real equivalence in Simplified Chinese.
Invoice is issued before payment, but Chinese 'invoice/FaPiao' is a state printed RECEIPT issued only after payment. Regarding the function of the invoice module, 'Bill/ZhangDan' in Chinese seems by far best understood by most ppl.
 2013-05-26 14:36:01 +08:00
Laurent Destailleur
2005ce8d6e Fix: Error with jmobile 2013-05-26 05:02:46 +02:00
Laurent Destailleur
418933e246 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-26 05:01:54 +02:00
Laurent Destailleur
f3f4dec96e Fix: Error with jmobile 2013-05-26 05:01:28 +02:00
Laurent Destailleur
f054032e79 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-26 04:06:34 +02:00
Laurent Destailleur
268c1cfa29 Fix: Removed useless file (not correctly defined) to avoid cache 
problems
 2013-05-26 03:57:34 +02:00
Laurent Destailleur
f239ec2aee Merge pull request #986 from FHenry/3.4 
Fix [ bug #911 ] Reorder intervention do not work
 2013-05-25 14:41:33 -07:00
Florian Henry
557756058f Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41
 2013-05-25 20:58:02 +02:00
Laurent Destailleur
15402b9286 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-25 20:43:31 +02:00
Laurent Destailleur
e3e00b034b Fix: Dir with linked files was not renamed when invoices was renamed 
with its final ref (linked files were lost)
Fix: Ref visible into message was wrong.
Fix: Bad counting of product/service available
 2013-05-25 20:43:01 +02:00
Florian Henry
c61f7b6390 Fix [ bug #911 ] Reorder intervention do not work 2013-05-25 19:48:49 +02:00
Regis Houssin
309f59fb00 Fix: wrong field name 2013-05-25 19:03:16 +02:00
Regis Houssin
b9695ddc2b Fix: wrong field name 2013-05-25 19:02:06 +02:00
Laurent Destailleur
9ffbed07fe Fix: More consistent fix 2013-05-25 18:16:13 +02:00
Laurent Destailleur
2cac1f4c9c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
 2013-05-25 18:14:15 +02:00
Laurent Destailleur
8fa9a60bc6 Fix: Bad field size 2013-05-25 18:12:07 +02:00
Laurent Destailleur
2a96172294 Fix: Pb in synchro update 2013-05-25 18:12:00 +02:00
Laurent Destailleur
f16026b79c Fix: cyclic updates 2013-05-25 18:11:54 +02:00
Laurent Destailleur
99c657255e Fix: Bug erase member data 2013-05-25 18:11:42 +02:00
Laurent Destailleur
1bab0f9f58 Fix: Bad field size 2013-05-25 18:10:55 +02:00
Laurent Destailleur
44268903a0 Fix: Pb in synchro update 2013-05-25 18:01:50 +02:00
Laurent Destailleur
c36f8a0149 Fix: cyclic updates 2013-05-25 17:28:31 +02:00
Laurent Destailleur
8e1feba425 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-25 17:15:17 +02:00
Laurent Destailleur
06f6f48147 Fix: Bug erase member data 2013-05-25 17:14:56 +02:00
Laurent Destailleur
982fec65ec Merge pull request #984 from FHenry/3.4 
Fix [ bug #895 ] Description is lost when adding a new predefined
 2013-05-25 08:11:48 -07:00
Florian Henry
8656a9f417 Fix [ bug #895 ] Description is lost when adding a new predefined 
product to a contract
 2013-05-25 16:50:55 +02:00
Christophe Battarel
b8c51e3760 sort tasks by start date 2013-05-25 11:49:05 +02:00
Laurent Destailleur
389d64c25b Merge pull request #982 from FHenry/3.3 
Fix search product if multilingue
 2013-05-25 02:01:14 -07:00
Laurent Destailleur
7b13be4653 Merge pull request #978 from atm-maxime/3.4 
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
 2013-05-25 01:59:15 -07:00
Laurent Destailleur
e8f72fd401 Merge pull request #979 from defrance69/patch-9 
Update modFournisseur.class.php
 2013-05-25 01:52:30 -07:00
Laurent Destailleur
4c54bfe3a9 Merge pull request #980 from FHenry/3.4 
Fix multilangue search product list
 2013-05-25 01:52:06 -07:00
Florian Henry
5b02a3a67c Fix search product if multilingue 2013-05-24 22:44:26 +02:00
Florian Henry
0a041a7705 Fix multilangue search product list 2013-05-24 22:39:28 +02:00
Laurent Destailleur
1a3a749ccb Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:12:17 +02:00
Laurent Destailleur
7b29e58760 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-05-24 19:07:20 +02:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
b9f5c15542 Fix: Bad link if not supplier defined for product 2013-05-24 18:49:40 +02:00
Laurent Destailleur
c97d1cb15b Try a fix for some browsers 2013-05-24 18:29:59 +02:00
Laurent Destailleur
6e634eb722 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-24 18:24:17 +02:00
Laurent Destailleur
92a7037c1d Fix: Missing translation 2013-05-24 18:20:28 +02:00
BENKE Charles
ed67173734 Update modFournisseur.class.php 
Add filter feature on the commande export
 2013-05-24 16:17:36 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00