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

4731 Commits

Author SHA1 Message Date
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
Laurent Destailleur
41a176ce72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/remx.php
	htdocs/core/modules/modStripe.class.php
	htdocs/product/stock/replenish.php
	htdocs/stripe/payout.php
 2019-12-03 13:58:15 +01:00
Laurent Destailleur
b1f2495771 Merge pull request #12598 from frederic34/patch-15 
The property db does not exist on mod_livraison_saphir
 2019-12-03 13:26:16 +01:00
Laurent Destailleur
87aaa5b11d Merge pull request #12597 from frederic34/patch-14 
The property db does not exist on mod_supplier_proposal_saphir
 2019-12-03 13:26:03 +01:00
Laurent Destailleur
9400d44f83 Merge pull request #12596 from frederic34/patch-13 
The property db does not exist on mod_reception_moonstone
 2019-12-03 13:25:51 +01:00
Laurent Destailleur
a56d4407ca Merge branch 'develop' into patch-11 2019-12-03 13:25:19 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
ptibogxiv
b67fb8be02 Fix stripe menu 2019-12-03 00:14:05 +01:00
Laurent Destailleur
32a539a8c0 Update website templates 2019-12-02 09:19:05 +01:00
Frédéric FRANCE
0b37d54841 The property db does not exist on mod_livraison_saphir 2019-12-01 20:58:45 +01:00
Frédéric FRANCE
5d9901bf59 The property db does not exist on mod_supplier_proposal_saphir 2019-12-01 20:57:14 +01:00
Frédéric FRANCE
318ba895e5 The property db does not exist on mod_reception_moonstone 2019-12-01 20:55:22 +01:00
Frédéric FRANCE
c780838e34 The property db does not exist on mod_propale_saphir 2019-12-01 20:50:18 +01:00
Laurent Destailleur
5cb014435b Try better fix for #12567 2019-12-01 19:29:53 +01:00
Frédéric FRANCE
1d0900445b The variable $letter does not seem... 
The variable $letter does not seem to be defined for all execution paths
 2019-12-01 18:52:50 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
3eec2430eb Merge pull request #12585 from atm-john/develop_factoring_token_usage 
Factoring token usage
 2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Maxime Kohlhaas
edb8bcb598 Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME 2019-11-30 22:58:32 +01:00
Laurent Destailleur
eed8f242b8 Update demo 2019-11-29 10:23:18 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM 
Enhance demo data for TakePOS
 2019-11-28 15:18:14 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Frédéric FRANCE
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Frédéric FRANCE
32aca5f186 Update pdf_standard.class.php 2019-11-26 19:52:10 +01:00
Laurent Destailleur
b0b579bdbf Fix phpcs 2019-11-26 09:13:35 +01:00
Frédéric FRANCE
4c4ae5b6e1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00