Commit Graph

594 Commits

Author SHA1 Message Date
gauthier
4d05bff780 FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back 2018-02-27 12:27:25 +01:00
atm-ph
5fef6478a5 Fix wrong calcul_price_total() update 2017-11-27 11:26:41 +01:00
atm-ph
219e58d0e4 Fix product type is ignored and can generate a diffrent result with situation invoice 2017-11-22 12:15:02 +01:00
Laurent Destailleur
884fc5d249 Update facture.class.php 2017-10-02 01:25:00 +02:00
Regis Houssin
4a63e6b6ec Fix: two errors when you create invoice from shipping 2017-09-29 19:07:13 +02:00
Laurent Destailleur
9341d5f448 FIX Line of invoices not inserted when using POS module and VAT NPR. 2017-06-09 15:35:27 +02:00
Laurent Destailleur
3555bd2bd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
2017-06-03 01:29:59 +02:00
gauthier
fb252706f9 FIX : situation_progress param default value must be 100 and not 0 2017-06-01 15:42:19 +02:00
Laurent Destailleur
b81de35703 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/contrat/class/contrat.class.php
2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e Fix escaping class 2017-05-12 15:28:10 +02:00
Laurent Destailleur
15d20497c8 FIX #6795 #6796 2017-05-05 17:46:22 +02:00
Laurent Destailleur
3917bdfc79 Fix vat_src_code propagation. 2017-05-02 22:37:43 +02:00
Laurent Destailleur
f6144b9ecb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-02-02 02:24:57 +01:00
Laurent Destailleur
18f3e11c10 Merge pull request #6339 from atm-maxime/fix_numbering_display_error
Fix numbering was disaplying technical error instead of error message
2017-02-02 00:49:18 +01:00
Laurent Destailleur
24c21cca27 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-28 15:56:27 +01:00
Laurent Destailleur
4f76626f51 FIX Creation of credit note on invoice with deposit stole the discount. 2017-01-28 15:55:44 +01:00
Laurent Destailleur
fd90bf466b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
c88e63ecc9 FIX #6259 2017-01-28 15:01:17 +01:00
Maxime Kohlhaas
7b6488b1c7 Fix numbering was disaplying technical error instead of error message 2017-01-27 10:05:57 +01:00
Maxime Kohlhaas
6474591e25 Allow to enter price in currency 2016-12-10 19:54:16 +01:00
Laurent Destailleur
4b831537e5 Fix several problem in notes management of template invoices. 2016-12-04 21:27:08 +01:00
Laurent Destailleur
017b18d5c6 Fix #6037 #6041 2016-11-27 16:09:16 +01:00
Laurent Destailleur
63d0622790 Fix phpcs 2016-11-24 19:48:28 +01:00
Laurent Destailleur
60b1591f0e Fix the notes must not be into the tooltip of ref. 2016-11-23 20:30:43 +01:00
Laurent Destailleur
2b944728fd Fix code comment 2016-11-23 19:29:41 +01:00
Laurent Destailleur
97034a7dff FIX #6009 2016-11-22 20:17:20 +01:00
Laurent Destailleur
af2f4cf78d Merge branch 'patch-20' of https://github.com/defrance/dolibarr into
defrance-patch-20

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/install/mysql/tables/llx_facturedet.sql
2016-11-12 13:36:45 +01:00
Laurent Destailleur
e9edbba093 NEW Usage of vat code seems ok everywhere. 2016-10-29 21:02:08 +02:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
6ef74b33c9 Uniformize code 2016-10-25 11:09:26 +02:00
Laurent Destailleur
39bc78909b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2016-10-24 03:35:43 +02:00
Laurent Destailleur
33a7b7037d Save information of vat code into database 2016-10-24 03:23:40 +02:00
Laurent Destailleur
63628f6a01 Uniformize look and feel 2016-10-17 21:27:40 +02:00
Laurent Destailleur
17379cb5cd Fix var_dump 2016-10-17 20:08:02 +02:00
Laurent Destailleur
d81cd7ebbe NEW Can link template invoice to other objects. Generated invoice will
be linked to same objects.
2016-10-04 11:14:00 +02:00
Laurent Destailleur
e92184a738 Fix bad var $db 2016-09-26 14:55:36 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
7c9996c840 Fix when creating recurring invoice, date next gen was not set 2016-09-10 05:25:07 +02:00
Laurent Destailleur
d821df070b Fix multicompany: recurring invoice must be in same env than template. 2016-09-10 04:33:23 +02:00
Laurent Destailleur
e22e243bc5 NEW Can set to paid automaically social or fiscal contributions after a
payment was recorded.
2016-08-22 14:31:15 +02:00
BENKE Charlie
45a0df53d8 Update facture.class.php 2016-08-17 16:42:02 +02:00
BENKE Charlie
025a0dc0b4 Update facture.class.php 2016-08-07 14:36:48 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
b85bb8c0f8 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
4e8e7f8e05 NEW New REST API explorer. Can create invoice and orders with lines. 2016-07-29 02:28:51 +02:00
Laurent Destailleur
80ac99e9b1 Fix missing field into response 2016-07-28 23:50:17 +02:00