lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
65,478 Commits 43 Branches 150 Tags 886 MiB
dfea391c88
Commit Graph

56981 Commits

Author SHA1 Message Date
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10 
Create index.html
 2018-09-05 14:15:22 +02:00
Frédéric FRANCE
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +02:00
Laurent Destailleur
252335318f
Update pdf.lib.php 2018-09-04 09:57:01 +02:00
Marc de Lima Lucio
e285b42a18 FIX: PDF address: handle when contact thirdparty different from document thirdparty 2018-09-03 17:57:30 +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
677d7dd0fb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-01 14:09:20 +02:00
Laurent Destailleur
123a66dc2a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/product/class/product.class.php
 2018-09-01 14:09:00 +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
bb444c80d0
Merge pull request #9360 from frederic34/patch-18 
Update ldap.php
 2018-09-01 13:28:16 +02:00
Laurent Destailleur
1eeb567e67
Merge pull request #9359 from frederic34/patch-17 
Update card.php
 2018-09-01 13:27:49 +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
Laurent Destailleur
160a35f63f
Merge pull request #9335 from frederic34/patch-11 
Update blockedlog.lang
 2018-09-01 12:19:36 +02:00
Laurent Destailleur
81c4e6a764 FIX Force stripe api version to avoid trouble if we update stripe api 
Conflicts:
	htdocs/stripe/config.php
 2018-09-01 12:03:44 +02:00
atm-ph
102b698c76 Fix search company by code 2018-08-31 11:38:45 +02:00
Laurent Destailleur
07d5bd143a Fix entity 2018-08-31 11:26:53 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php 2018-08-30 23:22:06 +02:00
Frédéric FRANCE
f61450ffa8
Update ldap.php 2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746
Update card.php 2018-08-30 23:03:03 +02:00
atm-greg
f8fef61075 remove useless db begin 2018-08-30 09:19:44 +02:00
Frédéric FRANCE
285e231ea1
Update blockedlog.lang 2018-08-29 23:08:13 +02:00
Laurent Destailleur
46fe19bed5 Code comment 2018-08-29 18:56:57 +02:00
Laurent Destailleur
0c11007e34 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	README.md
	htdocs/comm/propal/card.php
 2018-08-29 18:53:39 +02:00
Laurent Destailleur
34ceec7067 FIX #9328 2018-08-29 18:40:12 +02:00
Laurent Destailleur
428354303c FIX #9328 2018-08-29 18:29:42 +02:00
Laurent Destailleur
275b9a9960
Merge pull request #9325 from frederic34/patch-12 
Fix allow barcode with special char
 2018-08-29 18:01:15 +02:00
Frédéric FRANCE
24be0b7305
Update viewimage.php 
code may have rich content (qrcode, datamatrix,...)
 2018-08-29 13:08:52 +02:00
gauthier
61a57e619f FIX : $fk_account is always empty, must be $soc->fk_account 2018-08-28 16:54:04 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19 
Update card.php
 2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php 2018-08-28 02:27:56 +02:00
Laurent Destailleur
4369be7b39
Merge pull request #9284 from frederic34/patch-20 
Update commondocgenerator.class.php
 2018-08-28 02:11:50 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23 
typo
 2018-08-28 01:55:44 +02:00
Laurent Destailleur
1f807b9216
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges 
FIX : table llx_chargessociales doesn't exists
 2018-08-28 01:37:31 +02:00
Norbert Penel
f9c1dd8edd There is a begin transaction without rollback 
In this Select, there is no need of this Begin Transaction on my understanding.
Don't know why this line code is here for.
 2018-08-28 01:32:55 +02:00
gauthier
79aa390fe8 FIX : table llx_chargessociales doesn't exists 2018-08-27 15:07:19 +02:00
atm-ph
d9beb3f882 Fix tms missing in fetch propal 2018-08-27 10:19:07 +02:00
atm-ph
eb4e42bc40 Fix datec and tms missing in fetch method for API 2018-08-26 18:08:10 +02:00
Frédéric FRANCE
85ae8f3901
Update card.php 2018-08-24 09:29:17 +02:00
Laurent Destailleur
62b2981e42 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-23 19:47:31 +02:00
Laurent Destailleur
61ced8220b Fix sample doc 2018-08-23 17:49:14 +02:00
Frédéric FRANCE
343e6ce8b3
typo 2018-08-23 14:34:27 +02:00
Frédéric FRANCE
96f16b7497
Update commondocgenerator.class.php 2018-08-22 17:29:05 +02:00
Frédéric FRANCE
0334409d18
Update card.php 2018-08-22 13:43:30 +02:00
Laurent Destailleur
c7a241a5db FIX Get templates in a forced language 
Conflicts:
	htdocs/core/class/html.formmail.class.php
 2018-08-22 13:22:49 +02:00
Laurent Destailleur
4fdd521d61
Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks 
FIX : Fetch task will now fetch comments
 2018-08-21 13:36:20 +02:00
Laurent Destailleur
009424cd67
Merge pull request #9226 from atm-greg/Fix_project_delete_tasks 
Fix project delete tasks
 2018-08-21 13:11:00 +02:00
Laurent Destailleur
91bfa4be6c
Update project.class.php 2018-08-21 13:10:20 +02:00
Laurent Destailleur
3523c2b3d2
Update project.class.php 2018-08-21 13:09:06 +02:00