Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

7133 Commits

Author SHA1 Message Date
atm-greg
2f5b9ccb22 fix case objecttmp is an invoice 2019-07-03 17:00:18 +02:00
Frans Bosman
cd7d4de6ec Update commonobject.class.php 2019-07-03 16:53:26 +02:00
Frans Bosman
116c6d7a6a Update commonobject.class.php 2019-07-03 11:09:24 +02:00
Frans Bosman
9064737930 Update commonobject.class.php 2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add Update commonobject.class.php 2019-07-03 06:59:52 +02:00
fbosman
3e91fdda77 Update commonobject.class.php 2019-07-01 12:34:27 +02:00
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
d71330c00b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 02:04:16 +02:00
Laurent Destailleur
36e240a16d NEW Add statistics on product into contracts 2019-06-29 02:03:57 +02:00
Laurent Destailleur
ff7ae5ef20 Update extrafields.class.php 2019-06-28 12:56:31 +02:00
fbosman
f44203775a Update extrafields.class.php 2019-06-28 07:10:28 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
70967b4ea1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/utils.class.php
 2019-06-25 20:06:39 +02:00
Laurent Destailleur
d41850c7cd Fix purge of old files 2019-06-25 20:02:14 +02:00
Laurent Destailleur
4696d35bcb Fix we need to keep temp dir 2019-06-25 19:02:24 +02:00
Laurent Destailleur
f984a77044 FIX Fallback on main language for alternative languages 2019-06-25 14:05:10 +02:00
Laurent Destailleur
fffdd8797d FIX Fallback on main language for alternative languages 2019-06-25 14:04:34 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
2a3b4c3fd7 Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse 
NEW add extrafield separator collapsing capabilities
 2019-06-24 19:04:51 +02:00
Laurent Destailleur
604633afd1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 18:45:15 +02:00
Laurent Destailleur
31ffa6bc69 FIX #11218 #11150 2019-06-24 18:43:16 +02:00
Laurent Destailleur
28deca7100 FIX #11218 #11150 2019-06-24 18:40:31 +02:00
Laurent Destailleur
609eefaf08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:36:08 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
84575df7e6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-24 16:12:29 +02:00
Laurent Destailleur
3d185b6818 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 16:12:20 +02:00
Laurent Destailleur
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
John Botella
ec7446762c Fix travis 2019-06-24 14:36:06 +02:00
Laurent Destailleur
1daac232b0 Code comment 2019-06-24 14:31:58 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +02:00
Laurent Destailleur
9c54de57ce Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-23 18:12:56 +02:00
Laurent Destailleur
1c48b8be32 Fix code comment 2019-06-23 17:23:41 +02:00
Laurent Destailleur
efa09301b1 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 20:19:14 +02:00
Laurent Destailleur
8a9c858609 Code comment 2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0 Fix confusion between ->childs and ->childsoncascade 2019-06-22 20:17:40 +02:00
Laurent Destailleur
5c3d3cec9e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 18:44:12 +02:00
Laurent Destailleur
662afe8a36 Fix missing global 2019-06-22 18:24:29 +02:00
Laurent Destailleur
5675e7c50e Clean code of deprecated method 2019-06-22 18:19:40 +02:00
Laurent Destailleur
eb20df8e64 Fix debug save of state into setup 2019-06-22 14:47:46 +02:00
Laurent Destailleur
403d41ec30 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 11:55:33 +02:00
Laurent Destailleur
c63b465d48 Fix doxygen 2019-06-21 14:34:04 +02:00
Laurent Destailleur
bb9b0d401e Fix phpcs 2019-06-20 13:56:20 +02:00
florian HENRY
0865bdb60f fix depending extrafeilds list 2019-06-20 12:16:48 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
554724a46f Merge pull request #11363 from aspangaro/10.0_other 
Translate rights
 2019-06-20 03:36:16 +02:00
Laurent Destailleur
2c0d43a27a Merge pull request #11372 from bafbes/abb90059 
New:Show c_country elements in modulebuilder
 2019-06-20 03:32:53 +02:00