Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 18:48:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,922 Commits 36 Branches 190 Tags
70b11f18b51fac1f679080f832c3931e825468f5
Commit Graph

4830 Commits

Author SHA1 Message Date
Laurent Destailleur
312b153005 Fix phpcs 2017-07-13 23:46:01 +02:00
Laurent Destailleur
43f6eab2ea FIX #7146 2017-07-13 15:16:17 +02:00
Laurent Destailleur
c434f72d31 Merge pull request #7146 from hregis/6.0_bug3 
Fix: travis error (categorie)
 2017-07-13 14:46:41 +02:00
Laurent Destailleur
85d9a2f790 Merge pull request #7145 from hregis/6.0_bug2 
Fix: missing group name with dol_banner_tab
 2017-07-13 14:36:17 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
44b6b8cc65 Fix purge of log files was missing some log files. 2017-07-12 20:27:25 +02:00
Laurent Destailleur
a487492a7a Fix purge of log files was missing some log files. 2017-07-12 20:23:35 +02:00
Regis Houssin
44a44ab0a2 Fix: travis error 2017-07-12 16:45:32 +02:00
Regis Houssin
d63e15f0c6 Fix: missing group name with dol_banner_tab 2017-07-12 15:52:58 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15 Debug modulebuilder 2017-07-12 11:52:07 +02:00
Laurent Destailleur
c75db29ff2 Fix warning when module position is not correct 2017-07-11 12:54:49 +02:00
Laurent Destailleur
45d8fbb19e Fix gravatar 2017-07-08 21:39:48 +02:00
Laurent Destailleur
f40afcf023 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/facture/list.php
	htdocs/compta/paiement/class/cpaiement.class.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stats/facture.php
 2017-07-08 18:32:34 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
gauthier
a6f1e08c19 FIX : we have to check if contact doesn't already exist on add_contact() function 2017-07-07 11:48:30 +02:00
Laurent Destailleur
9baeee893f Fix multicurrency (tags for odt) 2017-07-07 10:54:54 +02:00
Laurent Destailleur
2aaf8b22f2 Fix substitution var 2017-07-07 10:10:12 +02:00
Laurent Destailleur
ab0a730d4a Fix bad GETPOST on 'action' 2017-06-29 02:54:56 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
Laurent Destailleur
59bd4749a8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/product/class/product.class.php
 2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab FIX vat code not saved during product creation. 2017-06-23 12:09:21 +02:00
Laurent Destailleur
693b2fe3b4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
 2017-06-23 11:20:29 +02:00
Laurent Destailleur
3a400c46ad Fix preselected email not done 2017-06-23 10:15:32 +02:00
Laurent Destailleur
1b96bb4221 Fix usage of constant. No need to have a dedicated setup as it should be 
supported by the responsive design architecture.
 2017-06-22 14:48:13 +02:00
Laurent Destailleur
474a2692fa Fix missing /div 2017-06-22 13:54:03 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
3ec0e6f7ef FIX #6885 2017-06-20 12:31:08 +02:00
Laurent Destailleur
d8b0199ba2 FIX #7040 2017-06-20 10:24:54 +02:00
Laurent Destailleur
658ba50aa8 Standardize picto status 2017-06-20 02:29:29 +02:00
Marcos García
eaaee59f92 FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working 2017-06-19 19:23:00 +02:00
Regis Houssin
d2371946ba Fix: for avoid warning 2017-06-19 09:50:13 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Laurent Destailleur
b73228899a Merge pull request #7024 from defrance/patch-14 
Introduce weight conversion lb & oz
 2017-06-17 17:52:20 +02:00
BENKE Charlene
fcdf68db6a Update commonobject.class.php 2017-06-17 16:31:54 +02:00
Laurent Destailleur
5b7a8e9c90 Fix missing signature when sending email from user card 2017-06-17 10:17:36 +02:00
BENKE Charlene
5320ebc051 getTotalWeightVolume : add conversion Lb & oz to KG 
New conversion value : Oz once
Little az a wizzard...
 2017-06-17 10:16:52 +02:00
Laurent Destailleur
26e80045a6 Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor 
NEW log download or preview event on a validate bill
 2017-06-16 11:06:27 +02:00
Laurent Destailleur
343e8d8498 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-16 00:49:52 +02:00
Laurent Destailleur
ac708a8ee9 Debug accounting module with new structure v6 
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
 2017-06-15 23:58:56 +02:00
Laurent Destailleur
f39fb5187a Fix component to select journal 2017-06-15 20:27:40 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +02:00
alexis Algoud
ef0907d89e NEW log download or preview event on a validate bill 2017-06-13 15:55:22 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
5d9a84dedb Fix sql syntax error 2017-06-12 15:35:50 +02:00
Laurent Destailleur
bf41056c68 Fix test on permission for widgets 2017-06-12 14:21:04 +02:00