Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 00:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,710 Commits 36 Branches 190 Tags
4b7de1e5f5cea42b5c70d38fe26d5e94adb51fda
Commit Graph

19772 Commits

Author SHA1 Message Date
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
57a5416cbc Update doc_generic_proposal_odt.modules.php 2019-12-31 14:20:39 +01:00
Frédéric FRANCE
ee7fe66749 Update doc_generic_order_odt.modules.php 2019-12-31 14:19:31 +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
Laurent Destailleur
094b37d79d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 19:12:32 +01:00
Laurent Destailleur
8e78dbad69 Fix for php 7.4 2019-12-23 16:41:22 +01:00
Laurent Destailleur
f193d3edd8 Fix for php7.4 2019-12-23 16:38:37 +01:00
Laurent Destailleur
1ebf7e642f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 15:49:25 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
VESSILLER
720146c45f FIX class Facture undefined in displaying margin information 2019-12-23 15:37:12 +01:00
Laurent Destailleur
d5f6ccc7a0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-23 14:40:36 +01:00
Laurent Destailleur
29cacec886 Fix month when using "Now" button addnowlink = 2 2019-12-23 14:39:24 +01:00
Laurent Destailleur
07c1a5717e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/facture_situation.php
	htdocs/core/class/html.formother.class.php
 2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Laurent Destailleur
c6ed605d26 Add missing fk_user in import list 2019-12-23 13:49:13 +01:00
Laurent Destailleur
93cece6a3a Merge pull request #12738 from mapiolca/patch-16 
#FIX Error Margin with Situation Invoice
 2019-12-23 13:43:18 +01:00
Laurent Destailleur
a92db7db39 Look and feel v11 2019-12-23 13:02:30 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Laurent Destailleur
d4138876af Fix alignement in validation popup 2019-12-23 11:16:40 +01:00
Laurent Destailleur
693551069b Fix look and feel v11 2019-12-22 21:32:35 +01:00
Laurent Destailleur
30b8affdb7 Fix look and feel v11 2019-12-22 21:32:19 +01:00
Regis Houssin
8321fe6ad2 FIX missing nl2br conversion 2019-12-22 09:13:34 +01:00
Laurent Destailleur
ad039ff968 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2019-12-21 14:03:45 +01:00
Laurent Destailleur
58771c7d8a Debug MRP v11 2019-12-20 17:39:42 +01:00
Laurent Destailleur
03649ea2c8 Fix pb with svg images 2019-12-19 19:10:23 +01:00
Laurent Destailleur
43ff015157 Fix pb with svg images 2019-12-19 19:09:56 +01:00