Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-30 21:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
76,279 Commits 38 Branches 191 Tags
210b2f37dc730bd58fee4cabba9540124e5b2879
Commit Graph

66822 Commits

Author SHA1 Message Date
Laurent Destailleur
210b2f37dc Fix error message 2019-06-04 19:18:20 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
ba68e3d7ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/website/class/website.class.php
 2019-06-04 18:47:22 +02:00
Laurent Destailleur
36df2f1026 Fix css 2019-06-04 18:45:01 +02:00
Laurent Destailleur
7b3242693b FIX default value for duration of validity can be set from generic 
feature.
 2019-06-04 18:17:07 +02:00
Laurent Destailleur
79a3e41418 Hook 'getAccessForbiddenMessage' 2019-06-04 12:48:06 +02:00
Laurent Destailleur
969e139d5c Fix parameters of accessforbidden 2019-06-04 12:21:27 +02:00
Laurent Destailleur
2c04a480a2 Fix phpcs 2019-06-04 02:31:19 +02:00
Laurent Destailleur
fd50e68f9a Fix look and feel v10 2019-06-04 02:15:52 +02:00
Laurent Destailleur
ba2b07917b Fix look and feel v10 2019-06-04 02:11:03 +02:00
Laurent Destailleur
cb859b7dfb Look and feel v10 2019-06-04 01:30:17 +02:00
Laurent Destailleur
29d9983669 Fix look and feel v10 2019-06-04 01:22:26 +02:00
Laurent Destailleur
664e0b81d8 Debug module BOM 2019-06-03 22:07:34 +02:00
Laurent Destailleur
a143dba9f8 Work on incomplete code on BOM module 2019-06-03 20:46:11 +02:00
Laurent Destailleur
7d2cedfdcf Debug bom module 2019-06-03 19:29:49 +02:00
Laurent Destailleur
72f55e1d81 Debug modulebuilder 2019-06-03 18:11:53 +02:00
Laurent Destailleur
6c6c353177 Prepare 10.0 2019-06-03 16:47:43 +02:00
Laurent Destailleur
5530e003ba Fix title 2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af Fix missing title 2019-06-02 19:47:01 +02:00
Laurent Destailleur
1415ad5b53 Debug website module 2019-06-02 17:27:00 +02:00
Laurent Destailleur
094719e099 Fix prefix 2019-06-02 15:53:16 +02:00
Laurent Destailleur
3cd302605e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-02 15:49:44 +02:00
Laurent Destailleur
3cda0d2dc5 Fix phpcs 2019-06-02 15:49:10 +02:00
Laurent Destailleur
fc37c393ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-02 12:36:48 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
a20d824b97 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:34 +02:00
Laurent Destailleur
300f46cb01 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-06-02 12:30:25 +02:00
Laurent Destailleur
a1a9313487 Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2 
Fix : only invoice active lines of a contract
 2019-06-02 12:29:13 +02:00
Laurent Destailleur
4bbef9b478 Update card.php 2019-06-02 12:29:05 +02:00
Laurent Destailleur
7020e1ef29 Update card.php 2019-06-02 12:27:32 +02:00
Laurent Destailleur
d8adda82f9 Merge pull request #11291 from AXeL-dev/patch-9 
Fix #11256
 2019-06-02 12:23:27 +02:00
Laurent Destailleur
2b3c5902e6 Merge pull request #11281 from atm-maxime/fix_warning_resource 
Fix : warnings in resource module
 2019-06-02 12:17:19 +02:00
Laurent Destailleur
cb927847ab Update dolresource.class.php 2019-06-02 12:16:12 +02:00
Laurent Destailleur
40b212d5cc Merge pull request #11280 from atm-maxime/fix_warning_page_var 
Fix : avoid warning and uniformize $page var use
 2019-06-02 12:14:47 +02:00
Laurent Destailleur
3e9fbf0148 Update index.php 2019-06-02 12:14:07 +02:00
Laurent Destailleur
ea58f8a617 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-02 11:49:49 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
 2019-06-02 11:49:33 +02:00
Maxime Kohlhaas
916d3ce931 Fix : only invoice active lines of a contract 2019-06-02 11:00:58 +02:00
AXeL-dev
82b37a514c Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '') 2019-06-01 16:27:06 +00:00
AXeL-dev
d2c853c47b Fix #11256 2019-06-01 15:00:15 +00:00
Maxime Kohlhaas
d47913ed19 Fix : add refclient on bulk invoicing 2019-05-31 16:33:32 +02:00
Maxime Kohlhaas
0372276a7b Fix : warnings in resource module 2019-05-31 16:04:12 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Maxime Kohlhaas
9ab2f44946 Fix : missing rights test to display tag create link 2019-05-31 15:14:56 +02:00
Maxime Kohlhaas
15fd24a511 Fix : remove hardcoded llx_ prefix 2019-05-31 12:14:51 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
12c1531b3b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-31 11:39:06 +02:00
Laurent Destailleur
cd75794aaa FIX #11169 #11202 2019-05-31 11:38:54 +02:00
Laurent Destailleur
7e678f3d83 Merge pull request #11272 from hregis/develop_security 
FIX missing encrypt llx_const fields
 2019-05-31 10:57:00 +02:00
Regis Houssin
063fe35c97 FIX missing encrypt llx_const fields 2019-05-30 11:45:55 +02:00