Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
73,226 Commits 36 Branches 189 Tags
53b2100dbb5a01adaca31a1db4b004ae038ec00a
Commit Graph

324 Commits

Author SHA1 Message Date
Philippe GRAND
6b9b17f93e update with html5 compliant code 2019-02-04 13:57:38 +01:00
Frédéric FRANCE
77747ac2a3 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
Laurent Destailleur
0827929ede Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2019-01-28 16:29:34 +01:00
Laurent Destailleur
f7bcd1ef6d Fix trans 2019-01-28 01:35:12 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2019-01-27 18:27:58 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
ba87284a90 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-26 14:30:44 +01:00
Laurent Destailleur
a5daa25707 Move common code to get sell price into a method 2019-01-24 19:45:17 +01:00
gauthier
84e1f92acd FIX : when we add a payment on an invoice which already has payments with credit note or deposit amount, and then we get an excess received, discount amount must be $total_paiements + $total_creditnote_and_deposit - $object->total_ttc; 2019-01-23 15:16:51 +01:00
Laurent Destailleur
58bda12e22 css 2019-01-17 19:31:01 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Laurent Destailleur
3a8afafabd Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice 
New manage multicompany for invoice
 2019-01-16 18:51:01 +01:00
Laurent Destailleur
e7943ae844 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2019-01-16 16:48:21 +01:00
atm-quentin
013c078c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice 2019-01-16 10:52:46 +01:00
atm-quentin
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +01:00
mapiolca
bab82a77b5 Update card.php 
Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.
 2019-01-05 22:42:51 +01:00
ldestailleur
0353bd5302 FIX sql error when resetting payment mode / term 2018-12-29 07:48:47 +01:00
ldestailleur
2225d0a41e FIX sql error when resetting payment mode / term 2018-12-28 23:16:44 +01:00
Laurent Destailleur
3571eaee3d Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
611ccc4a9a Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
atm-quentin
c18f486179 set facture to invoice AND check invoicenumber conf 2018-11-16 11:20:03 +01:00
atm-quentin
a8ab666d62 remplacement en masse des $conf->entity par des getEntity('facture') 2018-11-16 11:17:18 +01:00
Frédéric FRANCE
ce6b7adaa0 Merge remote-tracking branch 'upstream/develop' into actionrefused 2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02 Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Regis Houssin
6f90516f57 FIX check write permission for multicurrency 2018-11-15 09:40:08 +01:00
Regis Houssin
976094043b FIX missing GETPOST('entity') 2018-11-14 17:34:27 +01:00
Regis Houssin
3294fada3d FIX working on invoice sharing (multicompany) 2018-11-14 14:59:36 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Frédéric FRANCE
09efde4901 Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 09:56:00 +01:00
Frédéric FRANCE
da3ee9ad9a Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4 Fix deletion of draft invoice 2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6 Fix perm to delete 2018-10-29 14:47:33 +01:00