2
0
forked from Wavyzz/dolibarr
Commit Graph

19091 Commits

Author SHA1 Message Date
Guillaume Matheron
e9e0aae1ce Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill) 2020-01-02 14:59:53 +01:00
Guillaume Matheron
4f65f8d095 Fixed bug (missing include) in formmargin.class.php, affecting display of propal 2020-01-02 14:13:26 +01:00
Laurent Destailleur
aa13eb7ac4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 23:14:33 +01:00
Laurent Destailleur
b98251f7b0 Fix phpcs 2020-01-01 23:14:13 +01:00
Laurent Destailleur
9200d7f2d7 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 23:02:02 +01:00
Laurent Destailleur
607d013a9d Fix phpcs 2020-01-01 23:01:42 +01:00
Laurent Destailleur
b90dbb585a Fix ident 2020-01-01 22:45:47 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
e7ac01e1bd FIX localtax info were not returned correctly when call done with id. 2020-01-01 22:27:47 +01:00
Laurent Destailleur
85d3b424f7 FIX: Substitution of login into link is wrong. 2020-01-01 22:27:08 +01:00
Laurent Destailleur
2e8fd25299 FIX Local taxes was not correctly supported in TakePOS. 2020-01-01 21:54:47 +01:00
Laurent Destailleur
ce7360ced3 Code comment 2020-01-01 18:43:46 +01:00
Laurent Destailleur
7d07c198bc FIX Price of purchase order and vendor invoice with multicurrency
FIX entering predefined product with a forced unit price
2020-01-01 17:15:26 +01:00
Laurent Destailleur
3d98863092 Fix bad position of lang loading 2020-01-01 13:51:14 +01:00
Laurent Destailleur
bf9f9df50f Fix var not defined 2020-01-01 13:46:09 +01:00
Laurent Destailleur
d175b34323 Fix log 2020-01-01 13:22:20 +01:00
Laurent Destailleur
821ff375b0 Fix update ref 2020-01-01 13:15:42 +01:00
Laurent Destailleur
6fdb5d8e33 FIX ref 2020-01-01 13:14:00 +01:00
Laurent Destailleur
e4a03e98b7 FIX Do not record resource owner of event when not defined.
More log to track payment errors.
2020-01-01 12:47:01 +01:00
Laurent Destailleur
eae0800021 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-01 11:24:10 +01:00
Laurent Destailleur
3825e9af06 FIX logo not found in some cases 2020-01-01 03:00:10 +01:00
Laurent Destailleur
4c6c8e172f Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04 FIX #12760 #12763 #12755 #12765 #12751 2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae Revert "FIX class Facture undefined in displaying margin information" 2019-12-31 17:26:02 +01:00
Laurent Destailleur
15f1153e82 FIX Avoid line feed when 100% 2019-12-31 17:22:12 +01:00
Laurent Destailleur
76052b8bb4 FIX Avoid line feed when 100% 2019-12-31 17:19:49 +01:00
Laurent Destailleur
0c05d02265 Merge pull request #12777 from jerash/develop
add credit notes and deposit to getListOfPayments
2019-12-31 17:15:10 +01:00
Laurent Destailleur
bd4894d7cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-31 17:10:53 +01:00
stickler-ci
6142e42d83 Fixing style errors. 2019-12-31 16:10:36 +00:00
Laurent Destailleur
5a692cecfb Code comment 2019-12-31 17:10:36 +01:00
Laurent Destailleur
9774b05f52 Update commoninvoice.class.php 2019-12-31 17:10:03 +01:00
Laurent Destailleur
a369690e16 Update commoninvoice.class.php 2019-12-31 17:07:56 +01:00
stickler-ci
d3ec867df5 Fixing style errors. 2019-12-31 16:07:07 +00:00
Laurent Destailleur
b3373e8ba5 Update commoninvoice.class.php 2019-12-31 17:06:30 +01:00
Laurent Destailleur
c341ad5e8d Update commoninvoice.class.php 2019-12-31 17:03:00 +01:00
Frédéric FRANCE
530eeffed7 NEW upload odt templates for sendings 2019-12-31 14:30:57 +01:00
Frédéric FRANCE
a7a474d032 Update doc_generic_contract_odt.modules.php 2019-12-31 14:28:14 +01:00
Frédéric FRANCE
596e2ccefc Update doc_generic_invoice_odt.modules.php 2019-12-31 14:15:17 +01:00
Frédéric FRANCE
0c58df51d9 Update doc_generic_odt.modules.php 2019-12-31 14:14:30 +01:00
Frédéric FRANCE
b6f7394959 NEW upload odt models for invoices 2019-12-31 14:13:10 +01:00
Frédéric FRANCE
95335f402e NEW upload odt models for thirdparties 2019-12-31 14:03:08 +01:00
Frédéric FRANCE
90235d0528 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-31 13:57:40 +01:00
stickler-ci
73e0bca359 Fixing style errors. 2019-12-31 00:13:42 +00:00
jerash
411f20c360 add credit notes and discounts to getListOfPayments 2019-12-31 01:08:25 +01:00
Laurent Destailleur
6e90e81be1 Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class
FIX class Facture undefined in displaying margin information
2019-12-30 22:00:28 +01:00
Laurent Destailleur
aa390b8c3c Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object
Fix decimal value on update object
2019-12-30 21:50:53 +01:00
TuxGasy
c9cc6cbbea Fix decimal value on update object 2019-12-29 23:15:49 +01:00
Marc de Lima Lucio
c8dfc3d9fc FIX: error 500 when getting margin info for objects other than invoices 2019-12-24 16:09:29 +01:00
Laurent Destailleur
d4f3d14b65 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:19:10 +01:00
Laurent Destailleur
9f5029aa0f Fix warning 2019-12-23 19:17:53 +01:00