Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
115,678 Commits 36 Branches 189 Tags
f85c239e4f0482d96cfef1743494b51f00b90509
Commit Graph

6922 Commits

Author SHA1 Message Date
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
85d3b424f7 FIX: Substitution of login into link is wrong. 2020-01-01 22:27:08 +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
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
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
ce3e658608 Fixing style errors. 2019-12-31 07:36:40 +00:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +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
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Frédéric FRANCE
3d19e1321b NEW upload odt models for proposal 2019-12-19 11:10:55 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-18 14:20:36 +00:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Frédéric FRANCE
b6c9de3928 upload odt models for order 2019-12-17 14:49:18 +01:00
Laurent Destailleur
6e2e02fd40 Look and feel v11 2019-12-16 21:06:32 +01:00
Laurent Destailleur
1af67a4336 Merge pull request #12713 from frederic34/doxygen_warning 
doxygen
 2019-12-16 19:02:10 +01:00
Laurent Destailleur
44c967f1cc Merge pull request #12716 from Dolibarr/scrutinizer-patch-19 
Scrutinizer Auto-Fixes
 2019-12-16 19:01:53 +01:00
Laurent Destailleur
c3cd6ad1af Fix example 2019-12-16 13:10:57 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-16 12:06:25 +00:00
Frédéric FRANCE
9e4fb8d4fe doxygen 2019-12-15 10:02:20 +01:00
Frédéric FRANCE
8c7f0e669b Update mod_chequereceipt_mint.php 2019-12-14 16:13:48 +01:00
Frédéric FRANCE
440b846e9a Update mod_chequereceipt_mint.php 2019-12-14 16:12:38 +01:00
Frédéric FRANCE
ddc827e48e Update mod_chequereceipt_thyme.php 2019-12-14 16:11:27 +01:00
Frédéric FRANCE
f15d65c2b9 doxygen 2019-12-14 16:09:48 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
a0d9a7a970 Merge pull request #12704 from frederic34/patch-20 
The property db does not exist on mod_arctic
 2019-12-14 13:55:08 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
Frédéric FRANCE
a3dd454f86 The property db does not exist on mod_arctic 2019-12-13 08:00:34 +01:00
Frédéric FRANCE
a63caf38d3 The variable $conf seems to be never defined 2019-12-12 20:39:28 +01:00
Laurent Destailleur
a612aefab7 Fix HTML5 2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
12f84d8254 doxygen 2019-12-11 23:04:27 +01:00
Mistral Oz - LWEP
b92ec604ec New model "Excel 2007" : first col at wrong position 
The first column start at id 0 instead of id 1. At id 0, the first column move at Z position. 
Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
 2019-12-10 18:25:30 +01:00
Laurent Destailleur
dfeca5fae8 Fix phpcs 2019-12-09 17:42:38 +01:00
Laurent Destailleur
a77dc75bd4 Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template 2019-12-09 16:05:23 +01:00
Laurent Destailleur
d73bd3ee9a Fix a supplier ref is mandatory for import 2019-12-06 18:43:13 +01:00
Laurent Destailleur
ed4f04f90a Fix a supplier ref is mandatory for import 2019-12-06 18:41:22 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Laurent Destailleur
606a13898c Merge pull request #12394 from mapiolca/patch-15 
Fix problem of display photo in the model
 2019-12-03 16:16:57 +01:00