Frédéric FRANCE
|
62501b11e8
|
add visibility
|
2019-03-02 00:14:22 +01:00 |
|
Laurent Destailleur
|
3bffa69f1d
|
Remove deprecated code
|
2019-02-27 15:23:56 +01:00 |
|
Laurent Destailleur
|
f83f746123
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/compta/facture/class/facture.class.php
|
2019-02-23 16:03:40 +01:00 |
|
Laurent Destailleur
|
cdf85b0d00
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-23 16:02:35 +01:00 |
|
ptibogxiv
|
d7ffcca59b
|
FIX fetch module / pos source
|
2019-02-23 16:00:07 +01:00 |
|
Laurent Destailleur
|
0298582fc3
|
Merge pull request #10640 from ptibogxiv/patch-122
FIX fetch module / pos source
|
2019-02-23 15:59:22 +01:00 |
|
ptibogxiv
|
98affe0921
|
Update facture.class.php
|
2019-02-20 14:25:25 +01:00 |
|
ptibogxiv
|
152585c1b8
|
Update facture.class.php
|
2019-02-20 13:20:46 +01:00 |
|
ptibogxiv
|
ef5372f476
|
Update facture.class.php
|
2019-02-20 13:04:22 +01:00 |
|
ptibogxiv
|
6416f24d5f
|
FIX fetch module / pos source
|
2019-02-20 12:35:13 +01:00 |
|
ptibogxiv
|
c0de2b5b07
|
Update facture.class.php
|
2019-02-20 12:22:02 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +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
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +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
|
300889f53a
|
# WARNING: head commit changed in the meantime
Fix
|
2019-01-19 13:22:38 +01:00 |
|
Laurent Destailleur
|
2bbaae88d6
|
Fix standardize 'createfromclone' param when cloning
|
2019-01-19 12:46:38 +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 |
|
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 |
|
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 |
|
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 |
|