Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 191 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

320 Commits

Author SHA1 Message Date
Laurent Destailleur
84ec39f043 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-23 12:25:53 +02:00
John BOTELLA
0855d84ccf FIX error messages not displayed 2019-04-18 10:40:34 +02:00
Frédéric FRANCE
89e8889c5c phpcs fix v9 2019-03-19 16:33:34 +01:00
Laurent Destailleur
dbe15d3685 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-19 13:10:17 +01:00
Laurent Destailleur
8664594fc8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-19 13:09:39 +01:00
Laurent Destailleur
89087c6847 Merge pull request #10800 from atm-quentin/FIX_wrong_vat_deposit_invoice 
Wrong vat if deposit from propal with multiple vat
 2019-03-18 11:14:11 +01:00
Laurent Destailleur
39e24d30aa Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-15 19:18:30 +01:00
Laurent Destailleur
681d626284 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-03-15 19:17:31 +01:00
Laurent Destailleur
b33c366b02 Update card.php 2019-03-15 19:16:49 +01:00
gauthier
a524bbc5c6 FIX : when we create deposit with multi tva, we mustn't add line if amount = 0 (example when we have a 100% reduc on one of origin invoice line) 2019-03-13 15:59:41 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
atm-quentin
ab781c32c7 Wrong vat if deposit from propal with multiple vat 2019-03-11 11:28:25 +01:00
Laurent Destailleur
b15e00cae7 FIX Autodetect buy price for invoices autogenerated with templates. 2019-03-06 21:39:09 +01:00
Laurent Destailleur
63d14b16c9 FIX The notes was also copied on invoice 2019-03-04 14:56:39 +01:00
Laurent Destailleur
ad7b8371da FIX Mark credit note as available for credit note in other currency 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/discount.class.php
 2019-02-18 18:30:15 +01:00
Laurent Destailleur
07d1559802 FIX Mark credit note as available for credit note in other currency 2019-02-18 18:27:06 +01:00
Laurent Destailleur
b2ec340a48 FIX Show button POS Ticket only if invoice was generated by POS 2019-02-18 17:04:53 +01:00
Laurent Destailleur
8abebb091c Var no more used 2019-02-08 09:33:01 +01:00
Laurent Destailleur
24955088de Merge pull request #10501 from hregis/8.0_mc 
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
 2019-02-08 09:31:26 +01:00
gauthier
29e4fce450 FIX : can't add lines on invoices 2019-02-06 12:35:23 +01:00
Regis Houssin
8860eab6b1 FIX wrong merged conflict 2019-02-05 07:40:50 +01:00
Regis Houssin
4a19cba257 FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9 2019-02-05 06:34:05 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5 Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Pierre Ardoin
30548d977f Prise en charge des Travaux supplémentaires 
Corrige la filtration pour permettre l'ajout de ligne lors de la présence de travaux supplémentaires en cours de chantier.
 2019-01-29 11:19:11 +01:00
Laurent Destailleur
f7bcd1ef6d Fix trans 2019-01-28 01:35:12 +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
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
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
0d384eea00 FIX credit note can have negative value 2019-01-16 09:33:24 +01:00
ldestailleur
0353bd5302 FIX sql error when resetting payment mode / term 2018-12-29 07:48:47 +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
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
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
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219 FIX Delete of draft invoice 2018-10-29 14:35:42 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00