Commit Graph

9087 Commits

Author SHA1 Message Date
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