Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

4492 Commits

Author SHA1 Message Date
Laurent Destailleur
ceba894d57 Start to work on new generation combo box. 2014-12-05 13:26:47 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
f6be48f255 Better translation 2014-12-04 14:36:06 +01:00
Laurent Destailleur
9c2485c469 Better explanation 2014-12-04 13:25:20 +01:00
Laurent Destailleur
83122ebe1e Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now 
for release.
 2014-12-04 13:20:56 +01:00
Laurent Destailleur
937414e9b1 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-04 11:04:11 +01:00
Laurent Destailleur
76bd7dd512 Fixed: A lot of fixed on project views (info on project area). Also add 
a limit to avoid problem with very large database.
 2014-12-04 11:03:48 +01:00
Laurent Destailleur
fe33a2a42e Better translation 2014-12-04 10:06:41 +01:00
Laurent Destailleur
cdba9b8972 Fix language file 2014-12-03 13:56:38 +01:00
Laurent Destailleur
c614e62c5b Merge remote-tracking branch 'origin/3.7' into develop 2014-12-03 13:29:51 +01:00
Laurent Destailleur
792eba4810 Merge branch '3.7-transifex' of github.com:GPCsolutions/dolibarr into 
GPCsolutions-3.7-transifex

Conflicts:
	htdocs/langs/pt_BR/oscommerce.lang
 2014-12-03 13:28:38 +01:00
Laurent Destailleur
1653384415 Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices 2014-12-03 13:14:35 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
bde5a5d307 Fix: Missing translation of batch-serial prouct module 2014-12-03 00:11:31 +01:00
Laurent Destailleur
8291a032d9 Fix: Bad translation 2014-12-02 19:38:55 +01:00
Laurent Destailleur
253fd83aca Fixed: When invoice is created from subscription, the accountancy code 
was wrong because product added was a free product using default value
for accountancy code. Fix is to choose product into member module
page.
 2014-12-01 13:26:05 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Ion Agorria
c36f94a9a3 Fixed dinamic typo to dynamic 2014-11-30 15:14:25 +01:00
Laurent Destailleur
d39dbe66c8 Fix: Removed duplicate entrie into language files 
Renamed tool so all script to run before release start with "fix".
 2014-11-30 14:51:57 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/product/stock/card.php
 2014-11-30 14:15:38 +01:00
Laurent Destailleur
e2c606f416 Better translation 2014-11-30 14:12:59 +01:00
Ion Agorria
004d88fe0b Fixed error when creating a price selecting a expression without filling the numeric price 2014-11-30 02:15:16 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
Laurent Destailleur
b9ea7d4d13 Fix: Stock decrease from POS 2014-11-29 17:38:12 +01:00
Laurent Destailleur
1797569a6d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 16:44:37 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when 
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
 2014-11-29 13:50:41 +01:00
aspangaro
64260cde72 Add button in admin->GUISetup to activate Html5 2014-11-29 07:07:27 +01:00
Ion Agorria
4ce8719d98 Fix lang typo 2014-11-29 06:37:49 +01:00
Ion Agorria
6c37d03f13 Added language entries for dinamic prices 2014-11-29 06:32:33 +01:00
Laurent Destailleur
7f0a01936e Fix a very old bug of conflicth into decrease stock when using point of 
sale, not compatible with option defined into stock module.
 2014-11-28 20:41:52 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Raphaël Doursenaud
10456f90d9 Language files should not be executable 2014-11-28 16:06:45 +01:00
Raphaël Doursenaud
92b54fd496 Removed deprecated oscommerce language files 
Note to transifex sync personnel: you may have to manually remove the file
from Transifex to prevent it from coming back!
 2014-11-28 16:03:45 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/main.inc.php
 2014-11-28 02:26:40 +01:00
Marcos García de La Fuente
0a0e0e068c Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-28 01:02:44 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
Frédéric FRANCE
5dbba380d2 Fix 1721 Missing translation on proposal creation 2014-11-24 20:54:38 +01:00
Marcos García de La Fuente
d9958efcd7 Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-24 12:45:46 +01:00
Laurent Destailleur
245a06d433 Merge remote-tracking branch 'origin/3.7' into develop 2014-11-23 16:52:15 +01:00
Laurent Destailleur
97a6bd842d Minor fixes. 2014-11-23 12:39:53 +01:00
Laurent Destailleur
02e18bc03d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:29:06 +01:00
Laurent Destailleur
b9cf6ddd65 Merge branch '1698' of github.com:aspangaro/dolibarr into aspangaro-1698 
Conflicts:
	htdocs/langs/en_US/donations.lang
 2014-11-22 15:44:59 +01:00
Laurent Destailleur
135e58871e Merge pull request #2061 from aspangaro/1704 
#1704 Untranslatable token in externalsite module admin
 2014-11-22 15:33:18 +01:00
Laurent Destailleur
06b663b92c Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 00:45:45 +01:00
Laurent Destailleur
a2d4046f50 Fixed: Untranslatable tokens 2014-11-22 00:45:04 +01:00
Laurent Destailleur
1246c20355 More complete translation 2014-11-22 00:12:09 +01:00
Laurent Destailleur
9f6a6d1300 Fix: Missing translation 2014-11-20 10:55:38 +01:00
aspangaro
01a5f22f4a #1704 Untranslatable token in externalsite module admin 2014-11-20 06:34:50 +01:00
Laurent Destailleur
84729a6aa3 Fix: Bad vars 2014-11-18 23:18:59 +01:00
aspangaro
1b077950cd #1698 Untranslatable strings in donation module admin 2014-11-18 19:54:48 +01:00