Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
87,753 Commits 36 Branches 189 Tags
45f834cb15122c034e1666a03e920f159183d7dd
Commit Graph

1410 Commits

Author SHA1 Message Date
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
a-schild
7df86cb630 Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:06:12 +01:00
a-schild
2f5db98a5c Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-16 13:05:22 +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
André Schild
1c0e15192d Fix for issue #10333 
paymentterm.class.php invalid SQL in fetch
 2019-01-15 20:43:16 +01:00
Laurent Destailleur
d929d93376 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-08 14:19:35 +01:00
diversity-co-uk
2dc87509ff Fix Invoice PUT, remove extra parameter 
The first parameter is expected to be the user.
The $id of the invoice is already contained in $this

See facture.class.php 1610:
function update(User $user, $notrigger=0)
 2019-01-08 14:17:33 +01:00
Laurent Destailleur
e7b703f0c0 Merge pull request #10154 from bugness-chl/develop-hookfacturerec 
NEW Adding hooks to facturerec
 2018-12-14 16:11:34 +01:00
Laurent Destailleur
c377350c35 Update facture-rec.class.php 2018-12-14 16:09:12 +01:00
Laurent Destailleur
88a52aa11d Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
f97b561af0 Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Chl
b67101c77c corr. #10154 2018-12-03 18:09:25 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Chl
864ce85341 NEW adding hooks to createRecurringInvoices() 
For example : send the newly generated invoice by mail.

We send the counter and the total so launching some action
on the last loop (generated invoice or error) is possible.

(bonus: correcting error reporting $this->errors to $this->errors[] )
 2018-12-02 01:34:13 +01:00
Chl
95b5d8790d corr. typo 2018-12-02 01:34:13 +01:00
Chl
6ea0919ebb facture-rec.class.php: reindent 2018-12-02 01:34:13 +01:00
atm-quentin
56d4a8a737 revert some code 2018-11-16 15:16:48 +01:00
atm-quentin
70fdff5c27 revert getNextValue function + createfromclone entity 2018-11-16 11:23:14 +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
atm-quentin
8e51204dff manage invoice with multicompany 2018-11-16 11:14:33 +01:00
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +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
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Philippe GRAND
f450e04856 Merge remote-tracking branch 'upstream/8.0' into 8.0 2018-10-26 15:38:15 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
5f6cbda5a6 Update facture.class.php 2018-10-20 22:34:00 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Laurent Destailleur
762d82f2fe Move declaration into common 2018-10-19 13:38:05 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
ptibogxiv
a77458cb36 Update facture.class.php 2018-10-17 00:07:21 +02:00
ptibogxiv
3fdf3c95b4 FIX harmony in date name with API 2018-10-17 00:04:44 +02:00
Laurent Destailleur
5d9b770511 phpcs 2018-10-15 13:32:09 +02:00
Laurent Destailleur
df4b3b09d2 Fix var not defined 2018-10-15 13:30:07 +02:00
Laurent Destailleur
abf8867061 Merge pull request #8207 from atm-john/New_invoice_default_documents 
NEW hidden option to define an invoice template for each invoice type
 2018-10-14 16:36:37 +02:00
Laurent Destailleur
8f4b74733c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
 2018-10-10 01:51:54 +02:00
Laurent Destailleur
b73a2a24ef FIX Tooltip on invoice widget 2018-10-10 01:16:53 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
Laurent Destailleur
84605bc59b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-09 16:59:47 +02:00
Philippe GRAND
e9bd1be41b Standardize and update code 2018-10-09 15:38:42 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Laurent Destailleur
35d5a495de Save pos_source with id of POS station 2018-10-08 22:51:20 +02:00
Laurent Destailleur
41f2289ffa Save pos station into invoice 2018-10-08 22:28:30 +02:00