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

68185 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc de Lima Lucio
2fab4d7f76 FIX: proposal: missing contact type translation key 2018-06-20 14:56:24 +02:00
dolibarr95
3b33dad8fd
Add supplier ref 
Hi

In all common case the supplier send a receipt with the parcel on which is writen his product ref (because this is his reference) with the quantity in the parcel and if he is smart/nice our reference.
By adding the supplier ref column the supplier order dispatch is easier.

Tks.
 2018-06-20 14:40:32 +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
8fc2f7441c Fix: to avoid deleting line breaks 2018-06-20 09:06:16 +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
a-schild
baba0757d7 Added filtering by prospect type and status 
Added filtering by prospect type and status
 2018-06-19 11:46:03 +02:00
a-schild
211bb87e46 Moved functionality to select by categories 
Moved functionality to select by categories
 2018-06-19 11:45:27 +02:00
atm-greg
df056980b5 fix bad result on fetch ProductStockEntrepot 2018-06-19 10:46:07 +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
Laurent Destailleur
31067b6250 FIX picto for type in product link in accountany list is wrong 2018-06-18 14:43:32 +02:00
Laurent Destailleur
ce5514bd68 Fix sql begin at wrong place 2018-06-18 14:37:16 +02:00
Laurent Destailleur
5b019eb985
Merge pull request #8982 from hregis/7.0_bug6 
Fix: "libelle" is deprecated, use "label" instead
 2018-06-18 14:32:35 +02:00
Laurent Destailleur
5d6d43d539
Merge pull request #8964 from atm-gauthier/6.0_accounting_entity 
FIX : need to filter on aa.entity for same accounting accounts available in several entities
 2018-06-18 14:30:55 +02:00
Philippe GRAND
41a0175827 clean and upsdate code 2018-06-18 14:17:43 +02:00
Regis Houssin
54a333c374 Fix: use label instead libelle 2018-06-18 13:54:14 +02:00
Regis Houssin
494d6dcfef Fix: libelle is deprecated, use label instead 2018-06-18 13:50:58 +02:00
Laurent Destailleur
ad2df304b4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/lines.php
	htdocs/fourn/commande/card.php
	htdocs/societe/class/societe.class.php
 2018-06-18 13:31:29 +02:00
Laurent Destailleur
16fee19b6f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-06-18 13:20:11 +02:00
Laurent Destailleur
102f9aa84f FIX Problems in accountancy module when using multicompany module. 2018-06-18 13:19:46 +02:00
Philippe GRAND
62586c7c5d clean and upsdate code 2018-06-18 12:47:17 +02:00
a-schild
3e9bc75c9c Added mailings to thirdparties 
Allows to select third parties as mailing targets, depending client/lead
and active/inactive status
 2018-06-18 12:23:27 +02:00
gauthier
fed61930d5 FIX : clause must not be there 2018-06-18 11:37:15 +02:00
atm-greg
2cdae2ec98 remove globalcard context 2018-06-18 11:30:38 +02:00
Laurent Destailleur
cf0be86d0e
Merge pull request #8963 from ATM-Marc/NEW_supplierorderexport_reffourn 
NEW: supplier order/order lines export: add supplier product ref
 2018-06-18 11:26:14 +02:00