Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
41,866 Commits 36 Branches 189 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

41866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4b9d1b901b Fix: [ bug #1401 ] Problème avec la génération des codes barres 2014-05-25 17:14:33 +02:00
Laurent Destailleur
6137d7ed45 Update doc 2014-05-25 11:15:26 +02:00
Laurent Destailleur
8e7b310fb6 Fix: [ bug #1400 ] Silent Warning create a draft invoice 2014-05-25 05:01:14 +02:00
Laurent Destailleur
1690da2369 Fix: Bad balance of td 2014-05-25 04:34:04 +02:00
Laurent Destailleur
936adfd0f5 Typo 2014-05-25 03:08:02 +02:00
Laurent Destailleur
44ebaf45cf Fix: favicon must use dol_buildpath and not hardcoded path 2014-05-24 18:21:05 +02:00
Laurent Destailleur
e6f828cd86 Link to Preferred Partners missing. 2014-05-24 17:00:49 +02:00
Laurent Destailleur
349d6177d1 Clean more secondary languages 
Add information of file and line number when a duplicate translation key
is found.
 2014-05-22 14:35:53 +02:00
Laurent Destailleur
e9ab84074e Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 14:33:42 +02:00
Laurent Destailleur
4e00d4467c Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 12:41:43 +02:00
Laurent Destailleur
3f96632e02 Fix: CRLF 2014-05-21 20:34:52 +02:00
Laurent Destailleur
94335b186e Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
 2014-05-21 20:30:07 +02:00
Laurent Destailleur
4a7e9e4d0b Fix: CRLF 2014-05-21 19:54:40 +02:00
Laurent Destailleur
c82ff0a146 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-05-21 19:51:05 +02:00
Laurent Destailleur
4a89446162 Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:47:41 +02:00
Laurent Destailleur
b146dcad31 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-21 19:45:28 +02:00
Laurent Destailleur
366bd64c4f Fix: When number reach 9999 with default numbering module, next number 
will be 10000 instead of 0000 and error.
 2014-05-21 19:44:53 +02:00
Regis Houssin
b39627288e Fix: missing hookmanager global 2014-05-21 11:48:45 +02:00
Laurent Destailleur
753ef28168 Fix: Data are clean once registered into dictionnaries. 2014-05-20 16:08:05 +02:00
Laurent Destailleur
28de634a95 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 20:42:38 +02:00
Laurent Destailleur
08c4a5dac7 Fix: Typo 2014-05-19 20:42:14 +02:00
Florian HENRY
ff1eb983c8 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-05-19 16:22:19 +02:00
Florian HENRY
5a5c858578 [ bug #1399 ] [pgsql] Silent warning when setting a propal as 
"facturée" in propal.php
 2014-05-19 16:21:59 +02:00
Laurent Destailleur
544bd27700 Merge pull request #1611 from guerinaxel/patch-3 
Correcting log use for commonobject.class.php
 2014-05-19 16:12:20 +02:00
Laurent Destailleur
ff46adf284 Merge pull request #1607 from GPCsolutions/3.6b-review 
3.6b review
 2014-05-19 16:07:49 +02:00
Laurent Destailleur
56415400eb Merge pull request #1606 from FHenry/3.5 
escape for insert SQL expedition module
 2014-05-19 16:03:36 +02:00
guerinaxel
1dbcd215b8 Correcting log use for commonobject.class.php 
Correcting dol_syslog use which had 3 parameters instead of 2.
 2014-05-19 15:54:43 +02:00
Laurent Destailleur
e09cc127fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-19 15:10:46 +02:00
Raphaël Doursenaud
00162cc93d Members: fixed typo 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c83a0309b1 Barcode: fixed wrong menu 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
c3f05d1c1c Withdrawals: fixed bad translation key 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
3209483f1b Bank search: Better wording 2014-05-19 14:38:26 +02:00
Raphaël Doursenaud
400de35248 Products: missing translations 2014-05-19 14:38:18 +02:00
Raphaël Doursenaud
55e7862027 Added missing local communities links 2014-05-19 14:37:37 +02:00
Raphaël Doursenaud
13cb2e478f Contracts module configuration: missing translation string 2014-05-19 14:37:30 +02:00
Raphaël Doursenaud
fa1af990d2 Third party module configuration: cosmetic change 
Align the button on the right
 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
0fd994a687 Install: english comments 2014-05-19 14:33:39 +02:00
Raphaël Doursenaud
ba8676dc61 Install: unlimitted memory is ok 2014-05-19 14:33:39 +02:00
Laurent Destailleur
5709179cf0 Fix: Box was not added on correct side 2014-05-19 00:05:49 +02:00
Laurent Destailleur
39ce76ba1b Sync from transifex 2014-05-18 12:25:20 +02:00
Laurent Destailleur
4f52f22735 Fix: Run script from correct dir 2014-05-18 12:06:09 +02:00
Laurent Destailleur
01e3e13865 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	test/phpunit/DateLibTzFranceTest.php
	test/phpunit/ModulesTest.php
 2014-05-18 11:59:51 +02:00
Laurent Destailleur
0e13ded641 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
 2014-05-18 11:57:18 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
fb9a0f224b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-05-18 11:33:23 +02:00
Laurent Destailleur
1012595ff2 Fix for 3.6 beta 2014-05-18 11:33:07 +02:00
Laurent Destailleur
00dd7db75e Fix: Miscellaneous fixes into emailing target selectors (missing field 
name, missing translation, sql syntax error, missing fiels other)
 2014-05-17 19:43:22 +02:00
Laurent Destailleur
eec5d6d313 Fix: Error management of mass email feature 2014-05-17 19:02:47 +02:00
Florian HENRY
c2370f352b escape for insert SQL expedition module 2014-05-16 15:03:28 +02:00
Laurent Destailleur
ab337c7485 Merge pull request #1602 from atm-alexis/3.5 
FIX alert for customer order wasn't on delivery_date if exist
 2014-05-16 09:58:56 +02:00