Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 08:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

1950 Commits

Author SHA1 Message Date
Laurent Destailleur
faea6861c3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
	htdocs/langs/en_US/bills.lang
 2018-04-16 18:19:21 +02:00
Laurent Destailleur
f1ad3912e7 Fix multicompany compatibility for recurring invoice generation 2018-04-16 14:18:38 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
John
24bf8cb162 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-04-09 16:21:37 +02:00
John
63180f45a8 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-09 09:17:26 +02:00
TuxGasy
47dcc0d5c6 fix notrigger ignored on BILL_CREATE 2018-04-05 18:32:41 +02:00
Laurent Destailleur
9892a97424 Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE 
fix notrigger ignored on BILL_CREATE
 2018-04-05 18:27:45 +02:00
John
e966d11356 Fix credit note card apparence 2018-04-05 09:46:55 +02:00
TuxGasy
e5664f9630 fix notrigger ignored on BILL_CREATE 2018-04-04 20:32:36 +02:00
John
ce24ca08ee move list of situation table and fix credit note display 2018-04-04 12:33:48 +02:00
John
b7681e7249 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation 2018-04-03 14:12:49 +02:00
Laurent Destailleur
171ad5dce2 Enhance code for template invoices 2018-03-22 21:42:19 +01:00
John
b4983d0e6d FIX invoice filter 2018-03-22 11:37:16 +01:00
John
f91fe41f45 prepare invoice selection and calculation 2018-03-19 15:50:56 +01:00
Laurent Destailleur
12068f9cf3 Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
07fb29f0c4 Fix var not initialized 2018-03-16 12:18:20 +01:00
Laurent Destailleur
1716ac5f44 Fix var not initialized 2018-03-16 01:05:49 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
390618db47 Fix bad space 2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762 Fix phpcs 2018-03-10 22:41:57 +01:00
Laurent Destailleur
b0bd8cf910 Update facture.class.php 2018-03-10 12:56:19 +01:00
florian HENRY
40fb803ffd scrunitizer 2018-03-10 09:34:33 +01:00
florian HENRY
63fb53159c fix scrunitizer 2018-03-10 01:12:47 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb New : On invoice card, show accounting account linked 2018-03-08 06:52:31 +01:00
Laurent Destailleur
0cfa19ee09 NEW Online payment of invoice and subscription record the payment 
automatically.
 2018-03-06 00:12:23 +01:00
Laurent Destailleur
d569adea2f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-05 21:46:40 +01:00
Laurent Destailleur
2f9f4d0675 WIP Create payment of member subscription with paypal 2018-03-05 21:46:24 +01:00
Alexis ALGOUD
35002cf93d Merge branch 'develop' into NEW_price_on_stock_mvt 2018-03-05 17:45:27 +01:00
Laurent Destailleur
4137e1cc76 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-02 17:56:30 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
ee488ed83e FIX invoice creation fails when next date not defined 2018-02-27 20:24:50 +01:00
Laurent Destailleur
f3c9d38f82 FIX invoice creation fails when next date not defined 2018-02-27 20:23:55 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
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
Laurent Destailleur
4866d63ece Fix method getListOfPayments in the wrong class 2018-02-26 09:45:15 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
7ff94c88bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 15:00:31 +01:00
Laurent Destailleur
251136bebf Fix PHPUnit 2018-02-25 15:00:14 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Laurent Destailleur
b87feab1e3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-02-22 12:19:20 +01:00
Laurent Destailleur
bc0993d6cd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
John
3c1803f1f2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-02-21 17:44:08 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
John
629b8e618e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_invoice_default_documents 2018-02-21 11:45:23 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00