Laurent Destailleur
|
e4698fb6a5
|
Merge
|
2019-02-18 19:14:25 +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 |
|
Frédéric FRANCE
|
b892fc7182
|
Update api_invoices.class.php
|
2019-02-14 18:22:35 +01:00 |
|
ptibogxiv
|
7f3f166a81
|
NEW link/delete contact in invoice object
|
2019-02-14 00:44:40 +01:00 |
|
Laurent Destailleur
|
b9467c10bf
|
Merge pull request #10561 from eoxia-jimmy/develop
NEW: API Proposal, Orders, Invoices: Add contact details
|
2019-02-13 16:39:57 +01:00 |
|
Frédéric FRANCE
|
56bbe41917
|
Update facture-rec.class.php
|
2019-02-12 23:54:38 +01:00 |
|
Jimmy L
|
a172ea00a4
|
Rest API: Proposal, Orders, Invoices: Add contact details
|
2019-02-12 17:54:59 +01:00 |
|
Laurent Destailleur
|
3e1b75e916
|
Merge pull request #10541 from grandoc/new_branch_10_02_2019
update with html5 compliant code
|
2019-02-12 13:35:27 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Philippe GRAND
|
19885cb465
|
update with html5 compliant code
|
2019-02-10 10:23:37 +01:00 |
|
Philippe GRAND
|
673e09d7c2
|
update with html5 compliant code
|
2019-02-10 10:21:54 +01:00 |
|
Philippe GRAND
|
508d6345a1
|
update with html5 compliant code
|
2019-02-10 10:16:58 +01:00 |
|
Philippe GRAND
|
c071e488cf
|
update with html5 compliant code
|
2019-02-10 10:10:41 +01:00 |
|
Laurent Destailleur
|
0e42e8824b
|
Merge branch 'develop' into new_branch_04_02_2019
|
2019-02-08 09:42:18 +01:00 |
|
Regis Houssin
|
8860eab6b1
|
FIX wrong merged conflict
|
2019-02-05 07:40:50 +01:00 |
|
Philippe GRAND
|
6b9b17f93e
|
update with html5 compliant code
|
2019-02-04 13:57:38 +01:00 |
|
Philippe GRAND
|
a14332b2b0
|
update with html5 compliant code
|
2019-02-04 13:51:39 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +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 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +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 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
77747ac2a3
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-28 16:35:12 +01:00 |
|
Laurent Destailleur
|
0827929ede
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
|
2019-01-28 16:29:34 +01:00 |
|
Laurent Destailleur
|
f7bcd1ef6d
|
Fix trans
|
2019-01-28 01:35:12 +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
|
ecc30b8ffe
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
|
2019-01-27 18:27:58 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +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
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +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
|
ba87284a90
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-26 14:30:44 +01:00 |
|
Laurent Destailleur
|
a5daa25707
|
Move common code to get sell price into a method
|
2019-01-24 19:45:17 +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
|
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 |
|
Philippe GRAND
|
8096844062
|
update with html5 compliant code
|
2019-01-18 10:10:39 +01:00 |
|
Laurent Destailleur
|
58bda12e22
|
css
|
2019-01-17 19:31:01 +01:00 |
|
Laurent Destailleur
|
5130019003
|
css
|
2019-01-17 19:27:26 +01:00 |
|
Laurent Destailleur
|
2e55bdf087
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-17 19:11:18 +01:00 |
|
Laurent Destailleur
|
16bb85b7fa
|
Merge pull request #10348 from a-schild/9.0
Fix for issue #10333 branch 9.0
|
2019-01-17 18:58:49 +01:00 |
|
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 |
|
Laurent Destailleur
|
f8973c9a22
|
Fix translation Late <> Alert
|
2019-01-16 17:44:39 +01:00 |
|