Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 22:11:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
75,891 Commits 36 Branches 190 Tags
1f789fa26649ce2bedaf9f1524e9fbb5791119a1
Commit Graph

4052 Commits

Author SHA1 Message Date
Nicolas ZABOURI
1f789fa266 FIX syntax 2019-05-17 11:24:24 +02:00
Laurent Destailleur
53b7f3fe92 Merge pull request #11173 from aspangaro/10.0_accountancy_cat 
NEW Add accoutancy sell intra and export in product import
 2019-05-16 21:14:46 +02:00
Laurent Destailleur
c24c81692d Update modAccounting.class.php 2019-05-16 21:13:57 +02:00
Alexandre SPANGARO
6f9010c362 NEW add category in export of chart of accounts 2019-05-13 22:02:43 +02:00
Alexandre SPANGARO
d99424cdf0 NEW Add accoutancy sell intra and export in product import 2019-05-13 21:19:18 +02:00
Laurent Destailleur
30e08d8f9c Merge pull request #11167 from andreubisquerra/master 
TakePOS as stable
 2019-05-13 11:43:17 +02:00
Laurent Destailleur
f0cdaff936 Fix status of crons 2019-05-13 10:26:30 +02:00
andreubisquerra
166ac1b8c2 TakePOS as stable as indicated in the Changelog 2019-05-11 21:33:26 +02:00
Laurent Destailleur
0bd4c61009 Fix default setup of module workflow was not set 2019-05-10 18:15:09 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-10 17:45:33 +02:00
Juanjo Menent
e36df726a1 Merge remote-tracking branch 'upstream/9.0' into 9.0 2019-05-09 20:42:04 +02:00
Juanjo Menent
2b182c1cc1 FIX: #11097 2019-05-09 20:39:30 +02:00
Laurent Destailleur
bc49f47718 Fix phpcs 2019-05-09 19:48:13 +02:00
Laurent Destailleur
52153d6aa2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 12:38:27 +02:00
Laurent Destailleur
677b333d0a FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick 
hack to fix output pb).
 2019-05-09 12:38:00 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
f1fd4108ae Debug/Clean code 2019-05-09 12:17:20 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00
Laurent Destailleur
ed98817f0d Fix template for situation 2019-05-09 10:15:38 +02:00
Laurent Destailleur
c3693cb007 Fix phpcs 2019-05-08 19:10:12 +02:00
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e Fix bad contact used 2019-05-08 18:20:28 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
Laurent Léonard
8d659d8078 Fix date format in customer orders documents 2019-05-04 07:12:13 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
Laurent Destailleur
8c76c404bd Merge pull request #11088 from defrance/patch-141 
planned_timespent not present on task
 2019-05-02 14:01:19 +02:00
Laurent Destailleur
425dd6faf7 Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Frédéric FRANCE
ac304f58b0 clean new commits 2019-04-30 20:37:59 +02:00
Laurent Destailleur
0cd1fc79f2 NEW Add a security permission to edit php dynamic content on website. 2019-04-30 13:05:13 +02:00
BENKE Charlene
f8f40a9239 planned_timespent not present on task 
duration is the good one
 2019-04-30 11:27:33 +02:00
Laurent Destailleur
3007905508 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/core/modules/modService.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/stripe/class/stripe.class.php
 2019-04-30 03:30:40 +02:00
Laurent Destailleur
d55c440740 Fix some product and services export profiles 2019-04-29 21:23:01 +02:00
Laurent Destailleur
101f6a5af3 FIX Several fixes on import of services/products 2019-04-29 20:41:36 +02:00
Laurent Destailleur
5d40124b22 Fix import of product price with multilevel prices 2019-04-29 20:15:03 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +02:00
Laurent Destailleur
0090b26946 Merge pull request #11049 from frederic34/patch-5 
Update mod_expedition_ribera.php
 2019-04-24 10:10:11 +02:00
Laurent Destailleur
ad9dfc826a Merge pull request #11051 from frederic34/patch-7 
Update mod_commande_saphir.php
 2019-04-24 10:09:58 +02:00
Laurent Destailleur
7ad214b2f1 Merge pull request #11052 from frederic34/patch-8 
Update mod_chequereceipt_thyme.php
 2019-04-24 10:09:38 +02:00
Laurent Destailleur
49c7d07e8c Merge pull request #11050 from frederic34/patch-6 
Update mod_contract_magre.php
 2019-04-24 10:09:28 +02:00
Laurent Destailleur
a1bff2ca36 Merge pull request #11048 from frederic34/patch-2 
Update mod_bom_advanced.php
 2019-04-24 10:09:07 +02:00
Laurent Destailleur
6d397316d6 Merge pull request #11053 from frederic34/patch-9 
In export modules, id is string
 2019-04-24 10:08:30 +02:00
Laurent Destailleur
742de5c777 Fix pdf of expense report 2019-04-23 16:04:53 +02:00
Frédéric FRANCE
53c851de7b Update export_csv.modules.php 2019-04-20 11:42:25 +02:00
Frédéric FRANCE
a0ce52bb23 Update export_excel.modules.php 2019-04-20 11:41:37 +02:00
Frédéric FRANCE
73b32f0679 Update export_excel2007.modules.php 2019-04-20 11:41:19 +02:00
Frédéric FRANCE
06a8513575 Update export_excel2007new.modules.php 2019-04-20 11:40:59 +02:00
Frédéric FRANCE
b05a5e49ff Update export_tsv.modules.php 2019-04-20 11:39:38 +02:00
Frédéric FRANCE
e5559ac2f9 Update mod_chequereceipt_thyme.php 
The property db does not exist on mod_chequereceipt_thyme.
 2019-04-20 09:36:47 +02:00