lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,540 Commits 43 Branches 150 Tags 886 MiB
21ca374c27
Commit Graph

67540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philippe Grand
21ca374c27
Update cibles.php 
Fixes
 2018-06-24 10:57:53 +02:00
Philippe Grand
b528368a8b
Update cibles.php 2018-06-24 10:56:06 +02:00
Philippe GRAND
afda5288a8 clean and update code 2018-06-22 16:27:11 +02:00
Laurent Destailleur
02fbe4a84c
Merge pull request #8991 from hregis/develop_product 
Fix: avoid Warning: A non-numeric value encountered
 2018-06-22 15:52:05 +02:00
Laurent Destailleur
6f1101a2d6
Update card.php 2018-06-22 15:51:26 +02:00
Laurent Destailleur
1bf0432a72
Merge pull request #8997 from ptibogxiv/patch-29 
add minute to duration services
 2018-06-22 15:12:57 +02:00
Laurent Destailleur
1cef4c1563
Merge pull request #8995 from ATM-Marc/FIX_develop_PR8841 
FIX PR #8841
 2018-06-22 15:10:33 +02:00
Laurent Destailleur
ac19a6e211
Merge pull request #8993 from hregis/develop_pgsql 
Fix: wrong field name, use "type" instead "llx_c_type_fees"
 2018-06-22 15:09:31 +02:00
Laurent Destailleur
c3c809cfc1
Merge pull request #9001 from dani/sync_rfc2307_members 
Sync rfc2307 group membership from LDAP
 2018-06-22 14:56:45 +02:00
Laurent Destailleur
11d4241221
Merge pull request #9002 from grandoc/new_branch_21_06_2018 
clean and update code
 2018-06-22 14:55:11 +02:00
Laurent Destailleur
430dea917e
Merge pull request #9005 from dolibarr95/patch-47 
FIX: Add rights check in shipping
 2018-06-22 14:54:47 +02:00
Laurent Destailleur
0f80508be1 Fix canvas on list is a feature going in the wall so i clean this. 2018-06-22 14:51:47 +02:00
Laurent Destailleur
77e7b5793f Fix translation 2018-06-22 14:31:45 +02:00
dolibarr95
45451f08b0
Add rights check 
Add rights check when edit parcel informations(weight, tracking...) of a shipping
 2018-06-22 12:25:14 +02:00
Laurent Destailleur
81497687e9 Fix missing oldcopy in trigger call 2018-06-22 10:55:36 +02:00
Laurent Destailleur
88d3bf0148 FIX creation of tasks must hide closed project 2018-06-21 18:47:02 +02:00
Philippe GRAND
da2f07c848 clean and update code 2018-06-21 15:01:45 +02:00
Daniel Berteaud
f4bfd8704d Sync rfc2307 group membership from LDAP 
With rfc2307 LDAP scheme, group members are listed in the memberUid attribute, as simple uid, not as full DN like rfc2307bis, or AD-style groups
 2018-06-21 10:21:18 +02:00
Laurent Destailleur
cfcedc1170 Fix remove old unique key constraint 2018-06-21 00:11:37 +02:00
Laurent Destailleur
1a8afeff2a Fix error message 2018-06-20 23:50:50 +02:00
Laurent Destailleur
a3b9d4f01b Fix tooltip on subsidiary list 2018-06-20 22:02:36 +02:00
Laurent Destailleur
07c514b85c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/projet/class/projectstats.class.php
 2018-06-20 21:56:10 +02:00
Laurent Destailleur
828a9296b4 Fix stats on project 2018-06-20 21:52:06 +02:00
Laurent Destailleur
714057d435 Fix stats on project. Must use assignement on project as filter. 2018-06-20 21:31:37 +02:00
Laurent Destailleur
90b2314d98 Code comment 2018-06-20 21:24:57 +02:00
Laurent Destailleur
9f2437fa04 Fix missing field 2018-06-20 17:59:01 +02:00
ptibogxiv
a6151ee11e
add minute to duration services 
add minute for duration description (more compliant thant 0,166667h for billing services  by minute
 2018-06-20 12:10:25 +02:00
Marc de Lima Lucio
dc951029cd Merge branch 'develop' of github.com:Dolibarr/dolibarr into FIX_pdf_note_incoterm 2018-06-20 10:31:35 +02:00
Marc de Lima Lucio
babc99465c FIX PR #8841 2018-06-20 10:22:43 +02:00
Marc de Lima Lucio
9fa9a716d5 FIX: pdf: overlap when linked elements and incoterms/public note displayed + port PR #8155 into supplier docs & contracts 2018-06-20 10:22:43 +02:00
Regis Houssin
e1db5ab433 Fix: wrong field name, use "type" instead "llx_c_type_fees" 2018-06-19 19:56:39 +02:00
Laurent Destailleur
a73296e212 Fix reseller not saved 2018-06-19 19:34:23 +02:00
Regis Houssin
b9fe6f8624 Fix: avoid warning 2018-06-19 19:00:23 +02:00
Regis Houssin
2c927dba01 Fix: wrong var name "shownav" 2018-06-19 18:33:22 +02:00
Regis Houssin
b9893bde1d Fix: avoid Warning: A non-numeric value encountered 2018-06-19 18:26:37 +02:00
bgenere
403116898f Fix cherry-pick 2018-06-19 18:25:52 +02:00
Laurent Destailleur
19e40466b1 css 2018-06-19 13:26:30 +02:00
Laurent Destailleur
fb2e820329 Fix menu not visible on jmobile 2018-06-19 13:17:46 +02:00
Laurent Destailleur
b364412a4a FIX Menu scheduled jobs not visible on jmobile conf 2018-06-19 13:10:13 +02:00
Laurent Destailleur
edd7499375 Fix clone with new architecture 2018-06-19 09:21:23 +02:00
Laurent Destailleur
e402f68593 Clean code 2018-06-19 08:51:25 +02:00
Laurent Destailleur
75dee7538b Fix add protection to avoir fatal error 500 2018-06-19 01:15:37 +02:00
Laurent Destailleur
5d5083199f FIX better text content for multipart email 2018-06-18 23:26:21 +02:00
Laurent Destailleur
f9f7d3655d FIX better text content for multipart email 2018-06-18 23:24:31 +02:00
Laurent Destailleur
c3f64ed36e FIX better text content for multipart email 2018-06-18 23:18:22 +02:00
Laurent Destailleur
da16805b00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-18 16:27:36 +02:00
Laurent Destailleur
d81398e72d Fix info on tooltip 2018-06-18 16:27:25 +02:00
Laurent Destailleur
62307b74e7
Merge pull request #8981 from grandoc/new_branch_18_06_2018 
clean and upsdate code
 2018-06-18 15:14:29 +02:00
Laurent Destailleur
b64b4abf07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-18 14:46:47 +02:00
Laurent Destailleur
4f877e7970 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/accountancy/supplier/lines.php
 2018-06-18 14:46:30 +02:00