Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
5819333b80 Css 2018-06-24 11:30:44 +02:00
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
Laurent Destailleur
1b5c5cfafb Fix select status 2018-06-24 10:42:07 +02:00
Laurent Destailleur
c405181393 Merge pull request #8987 from a-schild/develop 
Added mailing by thirdparty filtering by prospect type and status
 2018-06-24 10:31:09 +02:00
Laurent Destailleur
a50b62d7e7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-24 10:26:24 +02:00
Laurent Destailleur
4f533be01a For #9006 2018-06-24 10:26:08 +02:00
Laurent Destailleur
f6d0a2606f Merge pull request #9006 from atm-quentin/NEW_advance_targer_filter_everywhere 
Fix advance targer filter everywhere with tpl
 2018-06-24 10:26:04 +02:00
Laurent Destailleur
5829014218 Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
Laurent Destailleur
e9b4141dd9 Fix syntax error 2018-06-23 17:11:19 +02:00
Laurent Destailleur
3fa5649040 Fix bad test (dev journal visible when dev option on) 2018-06-23 15:22:39 +02:00
Laurent Destailleur
2db2ea3627 Fix colspan 2018-06-23 15:13:39 +02:00
Laurent Destailleur
00165871bd CSS 2018-06-23 15:10:44 +02:00
Laurent Destailleur
16f940b637 Prepare 7.0.4 2018-06-23 14:55:33 +02:00
Laurent Destailleur
0170906524 Look and feel 2018-06-23 14:39:24 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
Laurent Destailleur
dbb90e80a3 Fix syntax error 2018-06-23 12:57:41 +02:00
Laurent Destailleur
edec89ef1e Prepare 7.0.3 7.0.3 2018-06-23 12:44:30 +02:00
Laurent Destailleur
eb88f1e5c9 Fix look and feel v8 2018-06-23 12:41:03 +02:00
Laurent Destailleur
06342ff80c FIX contextpage on contact list 2018-06-23 12:06:17 +02:00
Laurent Destailleur
4dcc74d08f Fix the "back to list" link also restore the contextpage 2018-06-23 11:55:04 +02:00
Laurent Destailleur
f2ac5dab4a Fix contextpage of some menu entries 2018-06-23 10:28:06 +02:00
Laurent Destailleur
604a5a3568 trans 2018-06-23 00:19:47 +02:00
Laurent Destailleur
c871e81a52 Trans 2018-06-23 00:15:57 +02:00
Laurent Destailleur
7daee6dc6b A lot of fix of css and look and feel v8 2018-06-23 00:07:56 +02:00
Laurent Destailleur
83f4cf67e6 css 2018-06-22 23:21:16 +02:00
Laurent Destailleur
be2309c70f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-22 22:54:11 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Laurent Destailleur
ca04ffe420 Load lang 2018-06-22 17:07:49 +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
d458b383ad Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-06-22 15:29:44 +02:00
Laurent Destailleur
533c19cc2c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/core/lib/functions.lib.php
 2018-06-22 15:29:26 +02:00
Laurent Destailleur
8414ceaddb Merge pull request #9000 from ATM-Marc/FIX_7.0_propal_contact_SHIPPING 
FIX: proposal: missing contact type translation key
 2018-06-22 15:16:56 +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
bd7277431f Merge pull request #8986 from atm-greg/fix_desired_stock 
FIX bad result on fetch ProductStockEntrepot
 2018-06-22 15:01:19 +02:00
Laurent Destailleur
dab264c641 Merge pull request #8994 from hregis/6.0_multicompany 
Fix: to avoid deleting line breaks
 2018-06-22 15:00:26 +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
cfc8e8b0ef Merge pull request #8972 from fmarcet/7.0 
FIX Avoid converting into reduction twice and draft invoice
 2018-06-22 14:35:26 +02:00
Laurent Destailleur
5bee324578 Update paiement.class.php 2018-06-22 14:34:59 +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
atm-quentin
d8ebb5da8d FIX trans 2018-06-22 11:02:20 +02:00
Laurent Destailleur
81497687e9 Fix missing oldcopy in trigger call 2018-06-22 10:55:36 +02:00