Laurent Destailleur
56d921ea52
CSS
2019-03-02 12:57:07 +01:00
Frédéric FRANCE
728a3fcbba
Update facture-rec.class.php
2019-03-02 08:43:09 +01:00
Frédéric FRANCE
4fcde0eaa3
Update facture-rec.class.php
2019-03-02 01:37:49 +01:00
Frédéric FRANCE
62501b11e8
add visibility
2019-03-02 00:14:22 +01:00
Frédéric FRANCE
014f69850e
add visibility
2019-03-01 23:08:57 +01:00
Frédéric FRANCE
be8db31388
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-03-01 19:24:27 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility
2019-03-01 18:28:51 +01:00
Laurent Destailleur
2e128a786b
NEW Can change the customer account of an instance
2019-03-01 15:38:15 +01:00
Frédéric FRANCE
796ea6f4ea
add visibility
2019-02-28 23:19:58 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing
2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa
fk_projet -> fk_project
2019-02-27 15:32:18 +01:00
Laurent Destailleur
3bffa69f1d
Remove deprecated code
2019-02-27 15:23:56 +01:00
Laurent Destailleur
da826c4bc7
Fix bad var name
2019-02-27 01:22:26 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d
Look and feel v10
2019-02-26 19:37:32 +01:00
Frédéric FRANCE
346d1f410c
wip
2019-02-25 23:15:48 +01:00
Laurent Destailleur
8a9339a059
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/facture/class/api_invoices.class.php
2019-02-25 15:16:23 +01:00
Laurent Destailleur
dde18e803d
Fix transaction
2019-02-25 15:09:56 +01:00
Laurent Destailleur
3fa2680859
Merge pull request #10669 from frederic34/html5fix
...
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Laurent Destailleur
3f078203b9
Fix phpcs
2019-02-24 20:29:01 +01:00
Frédéric FRANCE
4f341ea022
replace html code by html5
2019-02-23 22:56:38 +01:00
Frédéric FRANCE
4b0b8e1c1f
Update api_invoices.class.php
2019-02-23 16:44:36 +01:00
Frédéric FRANCE
0e093ffb24
Update api_invoices.class.php
2019-02-23 16:41:40 +01:00
Frédéric FRANCE
f1e4c80771
Update api_invoices.class.php
2019-02-23 16:39:15 +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
Laurent Destailleur
9ba6e3f8f5
FIX #10638
2019-02-23 15:57:57 +01:00
Laurent Destailleur
2413c41622
Merge pull request #10639 from ptibogxiv/patch-121
...
NEW POS support in order (ex: online cart)
2019-02-23 15:19:10 +01:00
Laurent Destailleur
b3c3e8f09e
Merge pull request #10547 from Rusu-Marian-Dan/develop
...
New API markAsCreditAvailable
2019-02-23 14:39:13 +01:00
Laurent Destailleur
ca45651265
Update api_invoices.class.php
2019-02-23 14:38:13 +01:00
Laurent Destailleur
eb733728c3
Update api_invoices.class.php
2019-02-23 14:37:09 +01:00
Laurent Destailleur
5bf3a1f175
Update api_invoices.class.php
2019-02-23 14:36:51 +01:00
Laurent Destailleur
3d0af97e79
Update api_invoices.class.php
2019-02-23 14:24:37 +01:00
Cristian Torres
8ca6935f8b
[FIX] Variable $i is already declared
...
It was preventing displaying of the other accounts
2019-02-23 14:08:11 +01:00
Laurent Destailleur
59218de7de
Merge pull request #10637 from tony13tv/patch-1
...
[FIX] Variable $i is already declared
2019-02-23 14:07:46 +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
Laurent Destailleur
4296f959ca
Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION
...
Reorganize levels of menu accountancy
2019-02-20 04:55:35 +01:00
Cristian Torres
7128270a95
[FIX] Variable $i is already declared
...
It was preventing displaying of the other accounts
2019-02-19 11:37:46 -06:00
Laurent Destailleur
86c9dbc218
Merge branch 'develop' into new_branch_14_02_2019
2019-02-19 13:26:35 +01:00
Laurent Destailleur
e4698fb6a5
Merge
2019-02-18 19:14:25 +01:00
Laurent Destailleur
ad7b8371da
FIX Mark credit note as available for credit note in other currency
...
Conflicts:
htdocs/compta/paiement.php
htdocs/core/class/discount.class.php
2019-02-18 18:30:15 +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
Dan Rusu
75e52628ec
Merge remote-tracking branch 'upstream/develop' into develop
2019-02-16 09:07:44 +02:00
Philippe Grand
40345ea0f5
Update paiement_charge.php
...
fixed...
2019-02-15 17:38:35 +01:00
Laurent Destailleur
3f01b590fe
Merge pull request #10609 from frederic34/patch-17
...
Update api_invoices.class.php
2019-02-15 15:11:33 +01:00
Philippe Grand
7cb4455729
Update paiement.php
2019-02-15 10:42:06 +01:00
Philippe Grand
55dc5677b2
Update clients.php
2019-02-15 10:40:30 +01:00
Philippe Grand
18dbad0d42
Update list.php
...
We gone make it :)
2019-02-15 10:38:03 +01:00
Philippe Grand
348b6c9f69
Update list.php
2019-02-15 09:45:08 +01:00
Philippe Grand
88d84332e9
Update clients.php
2019-02-15 09:42:39 +01:00
Philippe Grand
a8fdcff934
Update paiement.php
2019-02-15 09:38:57 +01:00
Frédéric FRANCE
b892fc7182
Update api_invoices.class.php
2019-02-14 18:22:35 +01:00
Frédéric FRANCE
dc054e56ec
Update compta-files.php
2019-02-14 18:10:10 +01:00
Philippe GRAND
ec370e247a
update with html5 compliant code
2019-02-14 16:59:24 +01:00
Philippe GRAND
43486828db
update with html5 compliant code
2019-02-14 16:56:49 +01:00
Philippe GRAND
a6cc8278c8
update with html5 compliant code
2019-02-14 16:54:53 +01:00
Philippe GRAND
5b2c80b62d
update with html5 compliant code
2019-02-14 16:51:09 +01:00
Philippe GRAND
91fca7a1af
update with html5 compliant code
2019-02-14 16:48:10 +01:00
Philippe GRAND
2507ff9684
update with html5 compliant code
2019-02-14 16:45:49 +01:00
Philippe GRAND
ed1a59d00b
update with html5 compliant code
2019-02-14 16:43:40 +01:00
Philippe GRAND
1f2dd3bc29
update with html5 compliant code
2019-02-14 16:38:03 +01:00
Philippe GRAND
69f350eb0e
update with html5 compliant code
2019-02-14 16:33:38 +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
Laurent Destailleur
e18ff7d087
Merge pull request #10568 from frederic34/patch-20
...
Update facture-rec.class.php
2019-02-13 16:36:54 +01:00
florian HENRY
dd9896516b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/margin/agentMargins.php
htdocs/product/stock/movement_card.php
htdocs/projet/tasks/time.php
htdocs/resource/class/html.formresource.class.php
2019-02-13 12:52:07 +01:00
Laurent Destailleur
04e3f23476
Fix phpcs
2019-02-13 11:52:45 +01:00
Laurent Destailleur
5c27ec5d25
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/compta/compta-files.php
2019-02-13 11:21:20 +01:00
florian HENRY
de87321c15
fix travcis
2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_importproduct_measuringunit
Conflicts:
htdocs/contact/consumption.php
htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d
fix travis (mosty for dev no conerne by my changes)
2019-02-13 09:21:14 +01:00
Frédéric FRANCE
56bbe41917
Update facture-rec.class.php
2019-02-12 23:54:38 +01:00
Laurent Destailleur
d42bf54436
Fix export zip
2019-02-12 23:12:33 +01:00
Laurent Destailleur
036dc52170
Fix test
2019-02-12 19:55:54 +01:00
Laurent Destailleur
5a2161ad09
Debug export of zip
2019-02-12 19:47:46 +01:00
Laurent Destailleur
666d03f596
Fix multicompany for page to export zip of invoices
2019-02-12 18:15:30 +01:00
Laurent Destailleur
68e6f32320
css
2019-02-12 17:56:03 +01:00
Jimmy L
a172ea00a4
Rest API: Proposal, Orders, Invoices: Add contact details
2019-02-12 17:54:59 +01:00
Laurent Destailleur
3d3aca804f
Merge pull request #10554 from grandoc/new_branch_12_02_2019
...
update with html5 compliant code
2019-02-12 16:57:11 +01:00
Alexandre SPANGARO
7e60c3bf84
FIX: In various payment, subledger & accout may be alphanumeric
2019-02-12 16:27:25 +01:00
Philippe GRAND
f7a28328ed
update with html5 compliant code
2019-02-12 15:40:16 +01:00
Philippe GRAND
60e503c7d1
update with html5 compliant code
2019-02-12 15:02:54 +01:00
Philippe GRAND
5007ef82c8
update with html5 compliant code
2019-02-12 14:56:38 +01:00
Philippe GRAND
fd6eaf8c3d
update with html5 compliant code
2019-02-12 14:53:35 +01:00
Philippe GRAND
66e8380a4a
update with html5 compliant code
2019-02-12 14:48:07 +01:00
Philippe GRAND
e10d1eb365
update with html5 compliant code
2019-02-12 14:44:25 +01:00
Philippe GRAND
8a62c9bc5f
update with html5 compliant code
2019-02-12 14:40:30 +01:00
Laurent Destailleur
46941d4c20
Merge pull request #10539 from frederic34/patch-17
...
Update paiement.php
2019-02-12 13:43:09 +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
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
2019-02-12 13:33:39 +01:00
Laurent Destailleur
6f6a767255
Merge pull request #10520 from aspangaro/develop
...
NEW: Add subledger in various payment
2019-02-12 13:20:58 +01:00
Dan Rusu
57e2971a22
fix code indent
2019-02-11 19:58:01 +02:00
Laurent Destailleur
5c01ec158d
Fix regression
2019-02-11 15:40:33 +01:00
Dan Rusu
9ce4b91f5d
NEW | make credit note from invoice
...
inspired from the action of the button "Make credit note" from UI.
- load invoice data and lines
- check invoice type
- calculate totals and create new credit notes
- create DiscountAbsolute & commit changes
2019-02-11 09:31:43 +02:00
Dan Rusu
0698ddbd77
Revert "add API method to create credit note from invoice"
...
This reverts commit 288a876491
2019-02-11 09:24:16 +02:00
Dan Rusu
288a876491
add API method to create credit note from invoice
2019-02-11 09:14:06 +02:00
Philippe Grand
d589ba4847
Update clientfourn.php
...
fixed...
2019-02-10 19:13:11 +01:00
Philippe GRAND
0911631b47
update with html5 compliant code
2019-02-10 16:31:34 +01:00
Philippe GRAND
0d5726b70a
update with html5 compliant code
2019-02-10 16:08:03 +01:00
Philippe GRAND
5d6ebad557
update with html5 compliant code
2019-02-10 16:05:06 +01:00
Philippe GRAND
9670228f06
update with html5 compliant code
2019-02-10 16:00:59 +01:00
Philippe GRAND
d42ef14a92
update with html5 compliant code
2019-02-10 15:59:19 +01:00
Philippe GRAND
20c0af1f57
update with html5 compliant code
2019-02-10 11:04:09 +01:00
Philippe GRAND
1b25d284a2
update with html5 compliant code
2019-02-10 11:01:23 +01:00
Philippe GRAND
89351e6027
update with html5 compliant code
2019-02-10 10:56:34 +01:00
Philippe GRAND
e7f2b92eca
update with html5 compliant code
2019-02-10 10:49:42 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature
2019-02-10 10:45:49 +01:00
Philippe GRAND
2624865632
update with html5 compliant code
2019-02-10 10:38:50 +01:00
Philippe GRAND
83b95ae6cc
update with html5 compliant code
2019-02-10 10:25:20 +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
Frédéric FRANCE
2020e199b2
Update paiement.php
2019-02-09 16:35:10 +01:00
Frédéric FRANCE
580e5c42d2
GenericFunctionsFunctionCallArgumentSpacing
2019-02-09 12:00:49 +01:00
Laurent Destailleur
0e42e8824b
Merge branch 'develop' into new_branch_04_02_2019
2019-02-08 09:42:18 +01:00
Laurent Destailleur
8abebb091c
Var no more used
2019-02-08 09:33:01 +01:00
Laurent Destailleur
24955088de
Merge pull request #10501 from hregis/8.0_mc
...
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-08 09:31:26 +01:00
Alexandre SPANGARO
2ba8ae00e4
Merge remote-tracking branch 'upstream/develop' into develop
2019-02-06 21:56:01 +01:00
Alexandre SPANGARO
a28c926f03
Fix
2019-02-06 21:43:16 +01:00
gauthier
29e4fce450
FIX : can't add lines on invoices
2019-02-06 12:35:23 +01:00
Regis Houssin
8860eab6b1
FIX wrong merged conflict
2019-02-05 07:40:50 +01:00
Regis Houssin
4a19cba257
FIX [URGENT] broken feature, "$usercancreate" is for Dolibarr 9
2019-02-05 06:34:05 +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
Philippe GRAND
28a2135409
update with html5 compliant code
2019-02-04 13:45:50 +01:00
Philippe GRAND
386a4102b7
update with html5 compliant code
2019-02-04 13:44:02 +01:00
Philippe GRAND
b7605e233e
update with html5 compliant code
2019-02-04 13:40:00 +01:00
Laurent Destailleur
3babc11312
Fix phpcs
2019-02-04 02:06:32 +01:00
Frédéric FRANCE
e1e14ae6e6
wip
2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
2019-02-03 21:14:44 +01:00
Laurent Destailleur
efe5cd3dd8
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-02-03 21:13:06 +01:00
Laurent Destailleur
cdfeeafab9
FIX #10381
2019-02-03 21:12:05 +01:00
Laurent Destailleur
af9e2d07d2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/compta/paiement.php
htdocs/fourn/facture/paiement.php
2019-02-03 20:38:47 +01:00
Laurent Destailleur
4b77b3ff23
NEW Support tag {ccc} on payment ref
2019-02-03 20:36:20 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
Frédéric FRANCE
273d68381c
psr2 end file new line none found
2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Alexandre SPANGARO
13cf3b1d7f
Add subledger in various payment
2019-02-01 15:50:12 +01:00
Frédéric FRANCE
b766204690
wip
2019-01-30 22:53:47 +01:00
Frédéric FRANCE
f83ee43a19
Merge branch 'develop' into nospaceaftercomma
2019-01-30 22:15:22 +01:00
Laurent Destailleur
a23fd6f090
Fix phpcs
2019-01-30 20:55:55 +01:00
Laurent Destailleur
01f1f6162f
Fix phpcs
2019-01-30 20:06:21 +01:00
Laurent Destailleur
15bd99acf4
Fix phpcs
2019-01-30 20:06:05 +01:00
Laurent Destailleur
2882f45bca
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-30 18:55:01 +01:00
Laurent Destailleur
f67937c59d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-01-30 18:54:29 +01:00
Laurent Destailleur
ae1c4e065b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-01-30 18:53:56 +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
John BOTELLA
6f12cdf236
Fix travis
2019-01-28 11:58:16 +01:00
John BOTELLA
5dbc9ddae0
fix travis
2019-01-28 11:56:20 +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
e46fb303d0
Merge pull request #10386 from atm-florian/dev_newhiglightinvoice_onpayment
...
NEW show in blod invoice amount where we came from when making payment
2019-01-26 14:29:20 +01:00
Laurent Destailleur
adb7ec7015
Merge pull request #10399 from grandoc/new_branch_23_01_2019
...
update with html5 compliant code
2019-01-26 14:02:26 +01:00
Laurent Destailleur
6b4b03e6aa
Merge pull request #10405 from grandoc/new_branch_24_01_2019
...
update with html5 compliant code
2019-01-26 13:52:10 +01:00
Laurent Destailleur
63e04823b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-25 11:57:01 +01:00
Laurent Destailleur
63c66095e6
Work on file export
2019-01-25 11:56:50 +01:00
Laurent Destailleur
a5daa25707
Move common code to get sell price into a method
2019-01-24 19:45:17 +01:00
Philippe GRAND
c1b0d3667a
update with html5 compliant code
2019-01-24 16:47:19 +01:00
Philippe GRAND
0b353dc560
update with html5 compliant code
2019-01-24 16:43:28 +01:00
Philippe GRAND
7c086ba8ed
update with html5 compliant code
2019-01-24 10:02:06 +01:00
Philippe GRAND
1599f165ee
update with html5 compliant code
2019-01-24 09:57:39 +01:00
Philippe GRAND
7ff1555e58
update with html5 compliant code
2019-01-23 17:39:40 +01:00
John BOTELLA
624d17c96a
Fix missing no trigger arg
2019-01-23 17:32:49 +01:00
John BOTELLA
1c51716997
Fix missing trigger
2019-01-23 17:02:20 +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
fbf5a1c056
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-21 20:48:19 +01:00
florian HENRY
a5cbef7aec
new show in blod invoice amount where we came from for payment
2019-01-21 11:51:54 +01:00
Frédéric FRANCE
4ab19c25c8
add missing global $conf in bonprelevement class
2019-01-21 08:23:31 +01:00
Laurent Destailleur
c26f264cac
Merge pull request #10369 from mwelters/mwelters/addays
...
Add configurable days to SEPA Withdrawal Execution Date
2019-01-20 19:47:57 +01:00
markus
a45ea9239d
Rename consts and cleanup
2019-01-19 14:24:20 +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
markus
de9b8f427d
Add configurable days to SEPA Withdrawal Execution Date
2019-01-18 16:16:55 +01:00
Philippe GRAND
0290b74495
update with html5 compliant code
2019-01-18 10:18:18 +01:00
Philippe GRAND
44708ce7d5
update with html5 compliant code
2019-01-18 10:16:51 +01:00
Philippe GRAND
539660a45d
update with html5 compliant code
2019-01-18 10:13:05 +01:00
Philippe GRAND
8096844062
update with html5 compliant code
2019-01-18 10:10:39 +01:00
Philippe GRAND
68c6ccae22
update with html5 compliant code
2019-01-18 10:06:45 +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
67efae20f4
Fix css
2019-01-17 17:23:54 +01:00
Laurent Destailleur
ab5aaa6b43
Start debug compta-files
2019-01-17 00:32:43 +01:00
Laurent Destailleur
889ce7fc5d
Start debug compta-files
2019-01-17 00:09:05 +01:00
Laurent Destailleur
8d4d1dbf99
Fix phpcs
2019-01-16 18:51:51 +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
Laurent Destailleur
e7943ae844
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-16 16:48:52 +01:00
Laurent Destailleur
d3828130ab
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/adherents/class/adherent.class.php
2019-01-16 16:48:21 +01:00
a-schild
7e3bfd332e
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-16 13:07:00 +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
atm-quentin
0d384eea00
FIX credit note can have negative value
2019-01-16 09:33:24 +01:00
André Schild
1c0e15192d
Fix for issue #10333
...
paymentterm.class.php invalid SQL in fetch
2019-01-15 20:43:16 +01:00
delcroix Patrick
9d2d4bc91d
Fix compatibiliy issue with pgSQL
2019-01-15 17:06:48 +01:00
Laurent Destailleur
19be47dbf7
Code comment
2019-01-12 01:22:08 +01:00
Laurent Destailleur
22d4afbb62
Missing trans
2019-01-10 01:54:06 +01:00
Laurent Destailleur
48e407740d
Fix tooltip
2019-01-10 01:49:49 +01:00
Laurent Destailleur
fbd490da15
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa
FIX When changing date of payment, change also record in bank if not
...
conciliated yet.
2019-01-09 13:28:12 +01:00
Laurent Destailleur
d9999d61f6
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5
Fix look and feel v9
2019-01-09 12:26:49 +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
126e02798a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/cashdesk.lang
htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
8b1455f29e
FIX Cash fence
2019-01-07 19:35:20 +01:00
Laurent Destailleur
527ef8bdc8
Add nb of invoice to help cash fence
2019-01-07 19:02:38 +01:00
mapiolca
bab82a77b5
Update card.php
...
Permettre d'ajouter des lignes complémentaires en cas de travaux supplémentaires lors des situations de travaux.
2019-01-05 22:42:51 +01:00
ldestailleur
451b3e30cc
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
1b19f5153b
Fix cash fence feature
2019-01-03 14:18:02 +01:00
ldestailleur
7cb3b8dfec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:26 +01:00
ldestailleur
bc00fb177a
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-01-02 19:42:15 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
...
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
Alexandre SPANGARO
c4dbf41530
Look & feel
2018-12-30 21:21:40 +01:00
Alexandre SPANGARO
a2075b9d2c
V9 look & Feel, etc
2018-12-30 20:32:44 +01:00
ldestailleur
3af418349a
FIX Can't empty the payment mode
2018-12-29 07:54:30 +01:00
ldestailleur
0353bd5302
FIX sql error when resetting payment mode / term
2018-12-29 07:48:47 +01:00
ldestailleur
2225d0a41e
FIX sql error when resetting payment mode / term
2018-12-28 23:16:44 +01:00
Laurent Destailleur
0f76279a03
FIX Missing token and style
2018-12-27 03:46:14 +01:00
Laurent Destailleur
791b2f485a
FIX Missing token and style
2018-12-27 03:45:30 +01:00
Laurent Destailleur
5c516fdae2
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Regis Houssin
8f4c452075
FIX replace deprecated "print_fiche_titre" with "load_fiche_titre"
...
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
2018-12-25 08:34:26 +01:00
Laurent Destailleur
85375495e5
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/public/notice.php
htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
9b55cc401e
Fix trans
2018-12-22 11:32:27 +01:00
Laurent Destailleur
ae6596cac7
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-21 09:57:29 +01:00
Laurent Destailleur
d9b8a8c8ae
Debug cash fence feature
2018-12-19 16:12:55 +01:00
Laurent Destailleur
b0652494b5
Debug cash fence
2018-12-19 15:40:01 +01:00
Laurent Destailleur
707af49025
FIX Missing last month on vat report per month
2018-12-19 12:07:26 +01:00
Laurent Destailleur
e014fdc20b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 11:43:02 +01:00
Laurent Destailleur
6b5c0d1ea1
Save cash fence event into unalterable log
2018-12-17 11:41:59 +01:00
Laurent Destailleur
e06b06c788
Work on cash fence
2018-12-17 10:37:56 +01:00
Laurent Destailleur
e0e298f07b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-12-17 03:26:15 +01:00
Laurent Destailleur
bf9ee18bed
Standardize code.
2018-12-17 03:25:45 +01:00
Laurent Destailleur
72c5943c55
Execute trigger so we can record line into unalterable log table
2018-12-16 17:53:23 +01:00
Laurent Destailleur
ce2d67f225
Fix phpcs
2018-12-16 17:45:51 +01:00
Laurent Destailleur
e5e4ef7b8c
Work on cash fence
2018-12-16 16:47:09 +01:00
Laurent Destailleur
9ce07b9582
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c
Work on cash fence
2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae
Clean code of POS modules
2018-12-16 14:59:51 +01:00
Laurent Destailleur
699766223f
Fix phpcs
2018-12-16 13:00:24 +01:00
Laurent Destailleur
5dc9b44931
Fix phpcs
2018-12-16 12:59:59 +01:00
Laurent Destailleur
54a4a54afe
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/langs/en_US/banks.lang
2018-12-15 20:00:31 +01:00
Laurent Destailleur
2bfc5fe235
Work on cash fence
2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47
Work on cash fence feature
2018-12-15 19:46:51 +01:00
Laurent Destailleur
0451eb741b
Work on legal cash fence
2018-12-15 19:20:30 +01:00
Laurent Destailleur
8ce6f67773
Fix phpcs
2018-12-15 18:27:38 +01:00
andreubisquerra
cdaf048766
First CashControl version
2018-12-15 16:45:36 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master
...
First CashControl version
2018-12-15 16:44:24 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats
2018-12-15 15:17:15 +01:00
Laurent Destailleur
f55db6dd84
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop
...
Add a link for compta-files.php in the accountancy leftmenue
2018-12-15 12:09:42 +01:00
Laurent Destailleur
b511a056f4
Fix phpcs
2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309
Fix regression (bad name of function)
2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134
...
refactoring list.php with dol_sql_datefilter
2018-12-14 19:06:29 +01:00
Laurent Destailleur
59bc15377d
CSS
2018-12-14 18:58:55 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc
2018-12-14 17:44:08 +01:00
Laurent Destailleur
abd09ae631
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-14 17:24:17 +01:00
PMickael
37daface19
[Accounting][VAT] Fix balance should be based on period
...
[Accounting][VAT] Fix balance should be based on period
2018-12-14 17:23:45 +01:00
PMickael
5a9d034b1b
[Accounting][VAT] Fix balance should be based on period
...
[Accounting][VAT] Fix balance should be based on period
2018-12-14 16:17:25 +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
2011afe6fb
Merge branch 'develop' into actionrefused
2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate
2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel
2018-12-14 15:42:01 +01:00
Laurent Destailleur
5dabefe227
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-13 20:49:55 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber
2018-12-13 20:24:12 +01:00
Laurent Destailleur
4a61c1b6ed
FIX lang not loaded
2018-12-11 13:25:09 +01:00
andreubisquerra
939f31c71f
First CashControl version
2018-12-08 21:33:54 +01:00
Laurent Destailleur
21b3bbc2e6
Merge
2018-12-08 11:55:27 +01:00
Laurent Destailleur
a915d82883
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2018-12-08 11:42:30 +01:00
Laurent Destailleur
5ce26bae1b
Fix form of bank info for CH
2018-12-04 22:01:35 +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
Laurent Destailleur
275eeca135
Trans
2018-12-04 13:09:58 +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
Regis Houssin
8953a3ed73
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
Conflicts:
ChangeLog
2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a
QUAL rename facnumber by ref
2018-12-02 17:33:44 +01:00
Alexandre SPANGARO
088c002ed1
NEW: Add stats on entries & movements by fiscal year
2018-12-02 11:01:11 +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
BENKE Charlene
6ac3cfdd99
Update list.php
2018-12-01 23:48:36 +01:00
BENKE Charlene
b104c0889d
Update list.php
2018-12-01 23:44:24 +01:00
BENKE Charlene
f07d1411aa
Update list.php
2018-12-01 23:41:15 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
...
fix typo error
2018-11-29 10:57:48 +01:00
Philippe GRAND
2b6810e2ab
FIX: bad URL
2018-11-28 16:37:49 +01:00
Laurent Destailleur
436a85ef7a
Fix missing email
2018-11-27 20:34:43 +01:00
Laurent Destailleur
0367795488
Fix auto jump on record if only 1 record in a search
2018-11-27 11:09:47 +01:00
Philippe GRAND
9bf0f12068
fix typo error
2018-11-26 14:32:04 +01:00
Laurent Destailleur
ed1062c440
Css
2018-11-25 11:59:49 +01:00
Laurent Destailleur
f0e4c262a3
Merge pull request #10067 from ATM-Thibault/NEW_global_search_go_direct_on_card
...
FIX Support of option MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE was not complete
2018-11-24 11:13:49 +01:00
Laurent Destailleur
0a057c8277
Clean var_dump
2018-11-22 20:47:53 +01:00
Laurent Destailleur
fe35e72e83
Fix perf. Make only one request per group for year N-1.
2018-11-22 20:45:50 +01:00
Laurent Destailleur
5727cf2910
Prepare code for performance enhancement
2018-11-22 20:09:27 +01:00
Laurent Destailleur
72fc0226e3
Optimize performance: Remove call for year N, can be done with total of
...
each month
2018-11-22 19:45:35 +01:00
Thibault Descamps
d63d8088ed
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_global_search_go_direct_on_card
2018-11-22 11:37:25 +01:00
Thibault Descamps
c2e5a29246
NEW redirect if only one result on global search on card
2018-11-22 11:36:30 +01:00
Laurent Destailleur
784c13d9d0
Fix label of month
2018-11-22 11:14:05 +01:00
Laurent Destailleur
21e9c02b11
Performance enhancement in Accounting Personalized report
2018-11-22 10:40:15 +01:00
Thibault Descamps
1cc130e5f6
NEW : conf to change concat desc order
2018-11-21 09:57:44 +01:00
Laurent Destailleur
be4dc40dfa
Fix standardize date format for payment between customer and supplier
2018-11-20 10:16:54 +01:00
Laurent Destailleur
4845e90d95
Fix update of hours for payment
2018-11-20 10:03:38 +01:00
Laurent Destailleur
4bf5a12f35
Fix trans
2018-11-20 09:56:03 +01:00
Laurent Destailleur
c0dac69116
Merge pull request #10031 from aspangaro/9.0_style
...
Fix Page Salaries stats - Look & feel v9
2018-11-19 18:14:35 +01:00
Alexandre SPANGARO
4e39065e29
Fix Page Salaries stats - Look & feel v9
2018-11-17 07:37:32 +01:00
atm-quentin
a0d5607ba5
FIX error travis
2018-11-16 15:29:05 +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
e004fc2f5b
FIX block page if cant fetch
2018-11-16 11:17:34 +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
Frédéric FRANCE
ce6b7adaa0
Merge remote-tracking branch 'upstream/develop' into actionrefused
2018-11-15 22:15:45 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-15 22:01:36 +01:00
Regis Houssin
ffc9b02322
FIX missing one column
2018-11-15 18:28:12 +01:00
Regis Houssin
2d2e836965
FIX more simple
2018-11-15 17:45:33 +01:00
Regis Houssin
aaa9a4f47c
FIX use getEntity('invoice') instead getEntity('facture')
2018-11-15 17:27:49 +01:00
Laurent Destailleur
e1407c8289
Merge pull request #10012 from hregis/develop_mc
...
FIX compatibility between proposal sharing and proposalnumber sharing
2018-11-15 17:19:28 +01:00
Laurent Destailleur
d20bb41cde
Merge pull request #10017 from hregis/8.0_bug
...
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-15 16:43:00 +01:00
Regis Houssin
6f90516f57
FIX check write permission for multicurrency
2018-11-15 09:40:08 +01:00
Regis Houssin
bcc83408e0
FIX avoid error if $object->fk_account =< 0 for getNomUrl
2018-11-14 18:10:41 +01:00
Regis Houssin
976094043b
FIX missing GETPOST('entity')
2018-11-14 17:34:27 +01:00
Regis Houssin
3294fada3d
FIX working on invoice sharing (multicompany)
2018-11-14 14:59:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused
2018-11-13 21:40:17 +01:00
patrick Delcroix
e9d3db084a
new: link to the compta-files.php in the accountancy left menu
2018-11-10 15:35:56 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365
Fix look and feel v8
2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796
Fix look and feel v8
2018-11-08 09:51:46 +01:00
Laurent Destailleur
66ffcf287a
Fix filter on extrafields
2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10
Fix security on GETPOST('action'). Param must be sanitized.
2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e
FIX sanitize param $action
2018-11-05 17:53:31 +01:00
Laurent Destailleur
0c7f33e1ba
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-11-05 09:58:19 +01:00
Laurent Destailleur
2900947019
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2018-11-05 09:56:57 +01:00
Laurent Destailleur
e1e0001fda
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-11-05 09:56:00 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel
2018-10-30 19:04:35 +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
Laurent Destailleur
0127682996
Merge pull request #9881 from grandoc/8.0
...
merging and typo
2018-10-30 12:41:56 +01:00
Laurent Destailleur
8fbf5b1f33
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8
FIX deletion on draft is allowed if we are allwoed to create
2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4
Fix deletion of draft invoice
2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6
Fix perm to delete
2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e
FIX Delete of draft invoice
2018-10-29 14:41:00 +01:00
Laurent Destailleur
85b8c9f219
FIX Delete of draft invoice
2018-10-29 14:35:42 +01:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey
2018-10-27 18:07:05 +02:00
Frédéric FRANCE
42a9abad56
remove fieldlabel and add fieldeditkey
2018-10-27 17:45:29 +02:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
1b054f1b36
Fix invoice creation from contract was invoicing closed services #9087
2018-10-27 09:21:49 +02:00
Laurent Destailleur
087b68948d
Fix: do not use point for graph with too many points.
2018-10-26 17:32:32 +02:00
Laurent Destailleur
852b069785
Fix reponsive in stats pages
2018-10-26 15:46:17 +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
Laurent Destailleur
c9dca22df2
Merge pull request #9854 from atm-john/NEW_missing_payment_date_col
...
NEW Add due date column in payment lists
2018-10-24 12:27:59 +02:00
Laurent Destailleur
65a39269d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
Laurent Destailleur
01adaf253c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
1d80e16ad1
Merge pull request #9831 from frederic34/payment
...
payments
2018-10-24 03:25:01 +02:00
Laurent Destailleur
f8316abfc0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
atm-john
bed5084bcf
Add missing Max payment date col
2018-10-23 21:44:45 +02:00
Laurent Destailleur
c8aa884462
Fix search all
2018-10-23 17:16:46 +02:00
Frédéric FRANCE
5f6cbda5a6
Update facture.class.php
2018-10-20 22:34:00 +02:00
Frédéric FRANCE
fbc5ce623e
payments
2018-10-20 17:17:21 +02:00
Laurent Destailleur
b32ffdbbb9
Clean code
2018-10-19 14:59: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
Laurent Destailleur
cff2b923f9
Merge pull request #9784 from ptibogxiv/patch-80
...
FIX harmony in date name with API
2018-10-19 13:29:59 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16
2018-10-18 21:01:49 +02:00
Laurent Destailleur
05326e271d
FIX Filter on invoice type
2018-10-18 17:15:26 +02:00
Laurent Destailleur
7cafdc4d9a
Fix phpcs
2018-10-18 16:56:43 +02:00
gauthier
aea7299970
FIX : use discount with multicurrency
2018-10-17 15:49:08 +02:00
Frédéric FRANCE
7d8ff04292
Update paiement.class.php
2018-10-17 08:15:12 +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
Frédéric FRANCE
2e77b9fed9
fix phpunit
2018-10-16 22:42:18 +02:00
Laurent Destailleur
8d815c4e6b
Merge pull request #9766 from ptibogxiv/patch-73
...
ADD support of external modepayment
2018-10-16 20:30:24 +02:00
Laurent Destailleur
f1c85cb36d
Merge pull request #9757 from frederic34/patch-9
...
do not trim int
2018-10-16 19:37:07 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
...
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
2c1e8d6535
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
ptibogxiv
d377fc26b4
ADD support of external modepayment
2018-10-16 16:55:25 +02:00
Philippe GRAND
729ff0b9bb
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
2018-10-16 14:20:11 +02:00
Frédéric FRANCE
7492d42ad8
do not trim int
2018-10-15 18:47:12 +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
Maxime Kohlhaas
9be8c579d0
New massaction to generate PDF
2018-10-14 15:50:55 +02:00
Philippe GRAND
d98ebbd9ee
Standardize and update code
2018-10-13 10:39:27 +02:00
Laurent Destailleur
a2aa491c51
Merge pull request #9728 from atm-john/8.0_Fix_count_error
...
Fix count on no countable object
2018-10-12 17:52:30 +02:00
Laurent Destailleur
1ab6cd4b59
Update card.php
2018-10-12 17:51:32 +02:00
Laurent Destailleur
99fde00902
Merge pull request #9719 from frederic34/patch-11
...
do not trim int
2018-10-12 17:35:04 +02:00
John BOTELLA
92686100b2
Fix count on no countable object
2018-10-11 10:51:54 +02:00
John BOTELLA
ee225a2b8b
FIX situation prev percent
2018-10-11 10:14:22 +02:00
Laurent Destailleur
7f1aa217a6
Fix link
2018-10-10 18:38:53 +02:00
Laurent Destailleur
82e06eda75
FIX save search criteria when going on receipt from bank transaction
2018-10-10 18:33:32 +02:00
Laurent Destailleur
6446343e1b
Fix sort lost
2018-10-10 13:05:19 +02:00
Laurent Destailleur
cb29209457
NEW Enhancement in process to make manual bank conciliation
2018-10-10 12:47:18 +02:00
Laurent Destailleur
562ee1cb64
FIX checkbox to conciliate not visible if bank receipt nb known
2018-10-10 12:19:22 +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
Frédéric FRANCE
03fcc2f088
Update paymentvarious.class.php
2018-10-09 20:31:14 +02:00
Frédéric FRANCE
b917fd0cf2
do not trim int
2018-10-09 19:41: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
52369bcb2b
Standardize and update code
2018-10-09 15:46:10 +02:00
Philippe GRAND
e9bd1be41b
Standardize and update code
2018-10-09 15:38:42 +02:00
Laurent Destailleur
dfe9c05d2f
Merge menu entry for tags/categories as submenu of element.
2018-10-09 15:26:15 +02:00
Laurent Destailleur
0938ac4afa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/user/list.php
2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-10-09 14:53:39 +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
Nicolas Aupetit
c26fe00362
fix bank ref override "bordereau cheque" ref
2018-10-09 02:15:38 +11:00
Laurent Destailleur
19cf649b48
Add field to track source module of invoice
2018-10-07 13:59:40 +02:00
Philippe GRAND
83db36f9b2
Standardize code
2018-10-06 12:11:48 +02:00
Nicolas Aupetit
49693854ce
Typo fix: "eee" in localtax1 display
2018-10-06 13:51:46 +11:00
Philippe GRAND
94df8d297d
Standardize code
2018-10-05 15:44:57 +02:00
Philippe GRAND
c7c3780400
clean code
2018-10-05 15:34:32 +02:00
Marc de Lima Lucio
82651cd920
FIX: invoice stats: situation invoices were not counted
2018-10-05 12:12:04 +02:00
