Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 13:01:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,180 Commits 36 Branches 190 Tags
815206cb15d8881e80c8eb2aaba905e77950e92e
Commit Graph

17547 Commits

Author SHA1 Message Date
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213 Fix doc 2019-05-15 17:50:35 +02:00
Alexandre SPANGARO
6f9010c362 NEW add category in export of chart of accounts 2019-05-13 22:02:43 +02:00
Francis Appels
6e5d826d65 Clean PHPCS for commonobject.class 2019-05-13 22:02:33 +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
e2408fb54d Merge pull request #11170 from atm-greg/Fix_margin_calculation_on_display 
fix useless calculation
 2019-05-13 20:20:01 +02:00
Laurent Destailleur
94387cd0e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-13 12:28:25 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
 2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
atm-greg
644f247910 fix useless calculation 2019-05-13 12:02:46 +02:00
Laurent Destailleur
c67d79a4e2 Update files.lib.php 2019-05-13 12:00:13 +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
Laurent Destailleur
e84003d4ff Escape param 2019-05-13 09:29:34 +02:00
Laurent Destailleur
7a75567ad9 FIX Debug ticket module 2019-05-12 16:34:49 +02:00
andreubisquerra
166ac1b8c2 TakePOS as stable as indicated in the Changelog 2019-05-11 21:33:26 +02:00
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
cc64e3e5c0 Fix responsive 2019-05-10 19:38:08 +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
Laurent Destailleur
eed2b97913 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-10 17:40:53 +02:00
Laurent Destailleur
069df82380 FIX javascript error when ckeditor module not enabled 2019-05-10 17:40:34 +02:00
Laurent Destailleur
7712c54eb9 Merge pull request #11162 from hregis/develop_menu 
FIX wrong permissions in products/services menu
 2019-05-10 16:31:20 +02:00
Laurent Destailleur
1c3bcea1f9 Merge pull request #11157 from ptibogxiv/patch-180 
Fix img_credit_card with payment methods
 2019-05-10 16:28:52 +02:00
Laurent Destailleur
02b8e77df2 Fix responsive 2019-05-10 16:14:05 +02:00
Regis Houssin
449117ba52 FIX missing service 2019-05-10 15:53:49 +02:00
Regis Houssin
97de84d1e7 FIX wrong permissions in products/services menu 2019-05-10 15:48:48 +02:00
Laurent Destailleur
71ba368d57 Fix phpdoc 2019-05-10 14:02:45 +02:00
Laurent Destailleur
cd8f601cdc Fix length of vat number 2019-05-10 14:01:11 +02:00
Laurent Destailleur
00f6265870 Fix responsive 2019-05-10 09:33:21 +02:00
ptibogxiv
f50280f13b Fix img_credit_card with payment methods 2019-05-10 01:16:58 +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
314dc26b87 Look and feel v10 2019-05-09 19:32:19 +02:00
Laurent Destailleur
a5b1de4f6a Fix tab that should not be visible 2019-05-09 17:52:55 +02:00
Laurent Destailleur
1e970fa8d7 Merge pull request #11151 from atm-arnaud/FIX_linkedfiles_in_attached_files_was_broked 
FIX attached files list with link file was broked
 2019-05-09 15:05:51 +02:00
Laurent Destailleur
84714f39e2 Fix setup of terminal 2019-05-09 13:37:20 +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
atm-arnaud
4c90ba1a64 FIX attached files list with link file was broked 2019-05-09 12:11:18 +02:00
Laurent Destailleur
725de78d29 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 10:16:01 +02:00
Laurent Destailleur
ed98817f0d Fix template for situation 2019-05-09 10:15:38 +02:00
Laurent Destailleur
e5b613562a Merge pull request #11148 from andreubisquerra/master 
TakePOS Terminals
 2019-05-09 09:18:41 +02:00
Laurent Destailleur
c2abedeb24 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 21:43:57 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
96c021773e Update takepos.lib.php 2019-05-08 19:11:17 +02:00