Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-18 15:31:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,188 Commits 36 Branches 190 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

6654 Commits

Author SHA1 Message Date
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
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +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
aspangaro
31b90cf383 Add 1st version of calculator but need work 2014-11-17 06:38:06 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
d0fb732cce Fix: Bad value for ThousandSeparator. 2014-11-15 14:24:10 +01:00
Laurent Destailleur
4df754f36f Merge pull request #2015 from aspangaro/develop-patch 
Update accounting language
 2014-11-15 12:19:23 +01:00
Laurent Destailleur
58c06264e4 Merge branch 'develop' of github.com:BadPixxel/dolibarr into 
BadPixxel-develop

Conflicts:
	htdocs/langs/en_US/categories.lang
	htdocs/langs/fr_FR/categories.lang
 2014-11-15 12:17:46 +01:00
aspangaro
d15ef855da Correct travis 2014-11-12 07:37:59 +01:00
aspangaro
a55afd4f50 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-12 07:32:32 +01:00
aspangaro
c268b1fb64 Update accounting language 
Problem with transifex in french, the file is in french language on the website but in github, still in english...
 2014-11-11 14:49:26 +01:00