Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-13 21:11:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,061 Commits 36 Branches 190 Tags
01e7b5747d3ece7bb4623c8889ffa98ebb39bc7c
Commit Graph

15416 Commits

Author SHA1 Message Date
Philippe GRAND
8d7dfaf98c Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:49:42 +02:00
Laurent Destailleur
fe7a0c894f Merge pull request #9368 from atm-ph/fix_7.0_search_company_by_code 
Fix search company by code
 2018-09-01 14:42:32 +02:00
Laurent Destailleur
945e925399 Update html.form.class.php 2018-09-01 14:41:44 +02:00
Laurent Destailleur
e4e1bf5a1a Merge pull request #9361 from frederic34/patch-19 
Update discount.class.php
 2018-09-01 14:30:16 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
359eebbbec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:26:48 +02:00
Laurent Destailleur
08bc81a7ab Merge pull request #9370 from joseplluis/patch-5 
NEW optional param to show a specific extrafield
 2018-09-01 14:24:23 +02:00
Laurent Destailleur
bc71aef7b4 Code comment 2018-09-01 14:24:02 +02:00
Laurent Destailleur
5b6a44434c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-01 14:17:15 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Philippe GRAND
bd473059ae precise label comment 2018-09-01 14:13:05 +02:00
Laurent Destailleur
26cff9e11f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/langs/en_US/blockedlog.lang
	htdocs/stripe/config.php
 2018-09-01 14:13:01 +02:00
Philippe GRAND
7b47c79bc3 precise label comment 2018-09-01 14:06:58 +02:00
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Philippe GRAND
b59d49d3b3 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 13:58:33 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
b6f4b1dff7 Merge pull request #9363 from frederic34/patch-21 
Update modSociete.class.php
 2018-09-01 13:31:23 +02:00
Laurent Destailleur
06355f7f08 Merge pull request #9362 from frederic34/patch-20 
Update ldap.class.php
 2018-09-01 13:28:32 +02:00
Laurent Destailleur
dee9442720 Fix regression 2018-09-01 13:12:09 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3 Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Philippe GRAND
0e5d4206c9 Merge remote-tracking branch 'upstream/develop' into develop 2018-09-01 12:47:34 +02:00
Josep Lluís
bfaf7ae473 Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:44:16 +02:00
Josep Lluís
79ee31df5c Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-09-01 12:43:02 +02:00
Laurent Destailleur
8bd231adb0 Merge pull request #9357 from joseplluis/patch-3 
FIX undefined rights_class on modules may lose setup when module disabled
 2018-09-01 12:42:22 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
b89202572e Merge pull request #9342 from ptibogxiv/patch-51 
fix multicompany and footer ticket public page
 2018-09-01 12:33:55 +02:00
Laurent Destailleur
b863b5176d Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Laurent Destailleur
482ddd548a Merge pull request #9332 from frederic34/functionClosingBrace 
PSR2 FunctionClosingBrace
 2018-09-01 12:06:08 +02:00
Frédéric FRANCE
9454f897ef doxygen fix 2018-09-01 09:40:50 +02:00
Frédéric FRANCE
3b2e7732c2 function Comment Missing 2018-08-31 22:49:11 +02:00
Frédéric FRANCE
c2e49c82f8 function Comment Missing 2018-08-31 22:34:02 +02:00
Frédéric FRANCE
b015d05f07 function Comment Missing 2018-08-31 22:25:11 +02:00
Frédéric FRANCE
e47059fa36 function Comment Missing 2018-08-31 22:14:09 +02:00
Frédéric FRANCE
5d27318e3b function Comment Missing 2018-08-31 22:03:12 +02:00
Frédéric FRANCE
df6eccc5dd function Comment Missing 2018-08-31 22:01:13 +02:00
Frédéric FRANCE
ebcf43ec73 function Comment Missing 2018-08-31 21:39:23 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Josep Lluís
78c0aa437f NEW optional param to show a specific extrafield 
Using params in showOptionals you can show only a specific extrafield in a personalized form or canvas.
For example: print $object->showOptionals($extrafields, 'view', array('onlykey'=>'myfield_5'));
 2018-08-31 17:16:27 +02:00
Philippe GRAND
a62a5ab636 Merge remote-tracking branch 'upstream/develop' into develop 2018-08-31 17:00:46 +02:00
Laurent Destailleur
b08971b03b FIX vat rate code not return by get_product_vat_for_country 2018-08-31 14:52:34 +02:00
atm-ph
102b698c76 Fix search company by code 2018-08-31 11:38:45 +02:00
Frédéric FRANCE
2eade6ea68 Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Frédéric FRANCE
26c0244dbb Update ldap.class.php 2018-08-30 23:13:16 +02:00
Frédéric FRANCE
4ad5201a16 Update discount.class.php 2018-08-30 23:10:09 +02:00
Laurent Destailleur
8dc208c961 Fix missing legal ids in source address 2018-08-30 19:19:43 +02:00
Josep Lluís
d70e548f94 Fix: undefined rights_class on modules 
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
 2018-08-30 18:12:02 +02:00