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

42821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e5f81b1fec Merge pull request #2202 from defrance69/patch-38 
Update facture.php
 2015-01-06 00:13:55 +01:00
Laurent Destailleur
337d055872 Merge pull request #2199 from altatof/3.6 
FIX: dont remove price ht if it is forced (ie: calculated by margin rate and cost price, or by external module)
 2015-01-06 00:10:08 +01:00
BENKE Charles
191d4467e3 Update facture.php 
$soc already filled upper when $socid send
 2014-12-28 12:31:27 +01:00
Christophe Battarel
1ab6955494 FIX: dont remove price ht if it is forced (ie: calculated by margin rate 
and cost price, or by external module)
 2014-12-27 11:27:41 +01:00
Laurent Destailleur
c7937a9962 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-27 02:22:09 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Juanjo Menent
d40229e9cc Fix: Bad order field value 2014-12-26 09:14:19 +01:00
Laurent Destailleur
75dbcf4a78 Fixed: doxygen 2014-12-26 04:35:48 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
490b0c5f3a Merge branch 'marcosgdf-bug-1768' into 3.5 2014-12-26 04:13:36 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Laurent Destailleur
882fd9a798 Merge branch 'marcosgdf-bug-1757' into 3.5 2014-12-26 04:11:30 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1757

Conflicts:
	ChangeLog
 2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-12-26 04:09:08 +01:00
Laurent Destailleur
83e34a1c4e Merge branch 'marcosgdf-bug-1769' into 3.5 2014-12-26 04:07:53 +01:00
Laurent Destailleur
f31bf5d80e Merge pull request #2175 from marcosgdf/bug-1752 
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
 2014-12-26 03:49:02 +01:00
Laurent Destailleur
ade688b589 Merge pull request #2174 from marcosgdf/bug-1723 
Fix [ bug #1723 ] Draft tasks?
 2014-12-26 03:48:15 +01:00
Laurent Destailleur
b2d27a7d25 Merge pull request #2173 from marcosgdf/translation 
Fixed string not translated in linked objects of a project
 2014-12-26 03:47:56 +01:00
Marcos García de La Fuente
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Laurent Destailleur
f3fded2a0a Merge pull request #2171 from marcosgdf/bug-1649 
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 2014-12-25 23:25:22 +01:00
Laurent Destailleur
6c67df0698 Merge branch 'marcosgdf-bug-1731' into 3.6 2014-12-25 23:21:55 +01:00
Laurent Destailleur
224fa14e16 Merge branch 'bug-1731' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1731

Conflicts:
	ChangeLog
 2014-12-25 23:21:48 +01:00
Laurent Destailleur
33045668cd Merge pull request #2168 from frederic34/patch-5 
Translation error
 2014-12-25 23:19:42 +01:00
Marcos García de La Fuente
c050fe2a27 Merge branch '3.6' into bug-1649 
Conflicts:
	ChangeLog
 2014-12-25 01:27:57 +01:00
Marcos García de La Fuente
82fa3a447b Merge branch '3.6' into translation 2014-12-25 01:18:58 +01:00
Juanjo Menent
c4a6377af5 Merge pull request #2169 from marcosgdf/bug-1736 
Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks
 2014-12-24 14:27:06 +01:00
Marcos García de La Fuente
416f13c708 Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H 2014-12-23 16:00:04 +01:00
Marcos García de La Fuente
743867b91b Spanish translation 2014-12-23 15:57:30 +01:00
Marcos García de La Fuente
78307a748d Corrected confusing table header in task list 2014-12-23 15:56:29 +01:00
Marcos García de La Fuente
a90a03412a Fixed string not translated in linked objects of a project 2014-12-23 15:43:45 +01:00
Marcos García de La Fuente
3212fd2b27 Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify 2014-12-23 11:00:18 +01:00
Laurent Destailleur
56eddeade1 Fix merge changelog 2014-12-23 02:36:01 +01:00
Marcos García de La Fuente
db30186386 Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs 2014-12-22 22:52:43 +01:00
Marcos García de La Fuente
46fe2c67e0 Fix: [ bug #1736 ] Failing supplier Elephant numeration module with some masks 2014-12-22 22:32:05 +01:00
Frédéric FRANCE
748bef6134 Translation error 2014-12-22 20:02:53 +01:00
Laurent Destailleur
321fd47ffc Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-20 15:53:06 +01:00
Laurent Destailleur
219cd0f855 Fixed: Translation 2014-12-20 15:52:50 +01:00
Laurent Destailleur
0628f76a2b Merge pull request #2162 from FHenry/3.6 
Update odt2pdf.sh
 2014-12-20 13:20:53 +01:00
Laurent Destailleur
beaec59ab6 PHPCS 2014-12-20 00:29:53 +01:00
Laurent Destailleur
11368e48fe Update codesniffer to remove travis errors. 2014-12-20 00:11:12 +01:00
Laurent Destailleur
789d588fde Update codesniffer to remove travis errors. 2014-12-19 19:10:41 +01:00
Laurent Destailleur
1c2c1ff3d8 Update codesniffer to remove travis errors. 2014-12-19 19:09:15 +01:00
Laurent Destailleur
0bb431c4d0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-19 19:03:05 +01:00
Laurent Destailleur
47cab90336 Update codesniffer to remove travis errors. 2014-12-19 19:01:29 +01:00
HENRY Florian
578c4ca383 Update odt2pdf.sh 
Fix odt2pdf.sh
 2014-12-19 12:32:43 +01:00
Laurent Destailleur
3debf56c68 Update phpcs 2014-12-18 23:54:39 +01:00
Laurent Destailleur
3c24c1b11a Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 23:53:39 +01:00
Laurent Destailleur
b1c4d32fbf Update phpcs file 2014-12-18 23:53:17 +01:00