Commit Graph

8505 Commits

Author SHA1 Message Date
Laurent Destailleur
e3b1cb9fdb Update facture.class.php 2018-09-27 09:25:37 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
John BOTELLA
022f842cb0 Fix display good progress for new situation invoices 2018-09-25 10:28:47 +02:00
John BOTELLA
791c373db5 FIX credit note progression 2018-09-25 09:54:58 +02:00
Laurent Destailleur
b93ab79679 FIX Error messages 2018-09-25 00:39:28 +02:00
John BOTELLA
b1380a6902 FIX situation invoice total with credit note 2018-09-24 16:12:00 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Laurent Destailleur
57e359cd40 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:18:13 +02:00
Laurent Destailleur
dbb75e35a1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/agenda.lang
2018-09-24 10:14:38 +02:00
Laurent Destailleur
f88170e22a Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks
NEW Add somes hooks in bank planned entries
2018-09-23 15:49:50 +02:00
TuxGasy
db223af39b Add somes hooks in bank planned entries 2018-09-22 18:44:00 +02:00
Philippe Grand
239be3b58c Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
b05954fb1e Merge pull request #9061 from delcroip/comptafiles
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
2018-09-20 19:45:46 +02:00
Philippe GRAND
803505b6b7 Standardize and update code 2018-09-20 12:27:06 +02:00
Frédéric FRANCE
126e5ae3ad remove not needed require 2018-09-18 20:05:48 +02:00
Frédéric FRANCE
032f9729a5 correct trimParameters 2018-09-18 19:05:00 +02:00
Laurent Destailleur
61f5a2e899 Merge pull request #9533 from frederic34/trimParameters
trimParameters function
2018-09-18 15:04:32 +02:00
Laurent Destailleur
e65ec9f4ef Merge pull request #9530 from frederic34/patch-15
reduce complexity of cchargesociales class
2018-09-18 15:02:44 +02:00
Laurent Destailleur
e6791e1763 Merge pull request #9526 from frederic34/patch-10
completely comment unused code
2018-09-18 14:59:55 +02:00
Philippe GRAND
a1b15f170e Standardize and update code 2018-09-17 09:00:23 +02:00
Frédéric FRANCE
f935701d30 trimParameters 2018-09-16 15:35:19 +02:00
Frédéric FRANCE
b950043618 trimParameters 2018-09-16 15:16:08 +02:00
Frédéric FRANCE
367e202df0 reduce complexity of cchargesociales class 2018-09-16 13:54:17 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Laurent Destailleur
f7c2bd877a Comment dead code 2018-09-16 10:39:30 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
7b3b020533 completely comment unused code 2018-09-16 09:41:38 +02:00
Laurent Destailleur
5eff159e27 Merge pull request #9489 from frederic34/patch-9
Completely comment unused code
2018-09-15 16:59:49 +02:00
Laurent Destailleur
961505d510 NEW Add filter on staff range in list of thirdparties 2018-09-14 01:29:03 +02:00
Frédéric FRANCE
a128ea821e Completely comment unused code 2018-09-12 22:49:32 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
ce76a2e714 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 20:21:35 +02:00
Laurent Destailleur
82580cadf6 Merge pull request #9458 from frederic34/patch-17
Update account.class.php
2018-09-12 19:07:19 +02:00
Frédéric FRANCE
3e71f4e6b0 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
de8496773d Merge pull request #9441 from grandoc/new_branch_09_09_2018
New branch 09 09 2018
2018-09-12 18:24:34 +02:00
Laurent Destailleur
6291f18179 Merge pull request #9440 from frederic34/patch-5
Upper Lower Casing
2018-09-12 18:24:02 +02:00
Laurent Destailleur
3662ebe3a3 Fix syntax error 2018-09-12 18:05:20 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Maxime Kohlhaas
c94689e9a9 FIX remain to pay for credit note was wrong on invoice list 2018-09-12 11:53:57 +02:00
Laurent Destailleur
aad6a0871f FIX Lose filter on payment type or category after a sort on invoice list
Conflicts:
	htdocs/compta/facture/list.php
2018-09-12 10:59:53 +02:00
Laurent Destailleur
7bea9f5ffb FIX Lose filter on payment type or category after a sort on invoice list 2018-09-12 10:57:09 +02:00
delcroix Patrick
2a4c65726c new: delete zip after download
and correct date 2.0
2018-09-11 22:14:58 +02:00
delcroix Patrick
e36bc24dee fix:copyrights 2018-09-11 21:55:05 +02:00
delcroix Patrick
e3920edb79 correct for invoice supplier links 2018-09-11 21:53:47 +02:00
Frédéric FRANCE
cdc5a174aa Update account.class.php 2018-09-11 00:29:01 +02:00
Frédéric FRANCE
7e0b1055db Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Philippe GRAND
b40fe8e4c9 Standardize and update code 2018-09-09 12:07:14 +02:00