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

88760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e80722536d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-29 04:42:29 +02:00
Laurent Destailleur
8e70a731d3 doc 2020-08-29 04:42:14 +02:00
Laurent Destailleur
67a82ac3b5
Merge pull request #14583 from ptibogxiv/patch-350 
New fetch thirdparty by barcode
 2020-08-29 04:28:08 +02:00
Laurent Destailleur
47c5bf5f06 Fix example 2020-08-29 04:22:57 +02:00
Laurent Destailleur
82f93fed92 css 2020-08-29 03:52:27 +02:00
Laurent Destailleur
5eca65f673 css 2020-08-29 02:35:24 +02:00
Laurent Destailleur
983a3c59c8 css 2020-08-29 01:11:08 +02:00
ptibogxiv
00d619d08e
Update societe.class.php 2020-08-28 23:04:05 +02:00
ptibogxiv
8286978ce8
New fetch thirdparty by barcode 
ie: usefull for fidelity card with barcode/qrcode
if this PR ok, i will push PR for get thirdparty by barcode  and change thirdparty by barcode in takepos
 2020-08-28 22:44:58 +02:00
Laurent Destailleur
bf06a34139 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/fourn/facture/paiement.php
 2020-08-28 21:29:35 +02:00
Laurent Destailleur
ad87e753b4 Clean trim on GETPOST (already included inside GETPOST when not 'none' 2020-08-28 21:27:50 +02:00
Laurent Destailleur
144cc52b20
Merge pull request #14540 from TobiasSekan/FixSingelPaymentWithMulticurrency 
FIX non-numeric value on multicurrency payment (part 1)
 2020-08-28 21:17:32 +02:00
Laurent Destailleur
e5398c8f2d
Update paiement.php 2020-08-28 21:16:33 +02:00
Laurent Destailleur
0acb33fc91
Merge pull request #14582 from OPEN-DSI/new-ticket-remove-new-lines-in-mail 
NEW remove new lines in mail on add ticket message
 2020-08-28 21:08:17 +02:00
Laurent Destailleur
25f1f1eafb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-28 19:08:08 +02:00
Laurent Destailleur
04ad25d90f NEW Add the workflow interaction close intervention on closing ticket 2020-08-28 19:07:17 +02:00
lvessiller
c3b095c820 NEW remove new lines in mail on add ticket message 2020-08-28 17:54:57 +02:00
Laurent Destailleur
3f1c2e9d07
Merge pull request #14577 from bafbes/abb120136 
New option to see complete names of partners
 2020-08-28 17:50:18 +02:00
Laurent Destailleur
c4c0b8afd4
Fix 2020-08-28 17:49:30 +02:00
Laurent Destailleur
50b791cfca Fix css 2020-08-28 17:41:15 +02:00
Laurent Destailleur
9950f2ea83
Merge pull request #14581 from OPEN-DSI/new-ticket-add-subject-company-name 
NEW subject title with company name instead of application title in t…
 2020-08-28 17:36:38 +02:00
Laurent Destailleur
0b8d7f329e FIX added information on user list not visible with multiselect 2020-08-28 17:17:22 +02:00
lvessiller
49098218cb NEW subject title with company name instead of application title in ticket message 2020-08-28 16:55:28 +02:00
bahfir abbes
a031a10f77 fix:option to see complete names of partners 2020-08-28 13:34:40 +01:00
Laurent Destailleur
30838f01d4 Fix warning 2020-08-27 22:03:52 +02:00
Laurent Destailleur
d40f90fecb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-27 22:00:38 +02:00
Laurent Destailleur
ad63434f3e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/prelevement/index.php
 2020-08-27 22:00:10 +02:00
Laurent Destailleur
e52d71a880 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-27 21:58:29 +02:00
Laurent Destailleur
00fce1d18a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-27 21:58:23 +02:00
Laurent Destailleur
4ecd15b7ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/main.lang
 2020-08-27 21:57:42 +02:00
Laurent Destailleur
57951e1285 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-27 21:52:47 +02:00
Laurent Destailleur
c6bdd27d4c FIX #14530 2020-08-27 21:52:25 +02:00
Laurent Destailleur
8f34f4c1c5 FIX #14530 2020-08-27 21:46:28 +02:00
Laurent Destailleur
1b77dc4e13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-27 21:19:06 +02:00
Laurent Destailleur
c419e2f0de Sanitize vars 2020-08-27 21:18:49 +02:00
Laurent Destailleur
fe4acf4e4e NEW Add focus when editing on product/stock/product.php Close #14548 2020-08-27 21:18:40 +02:00
Laurent Destailleur
4624cf98ee
Merge pull request #14545 from cfoellmann/defaults-payment-selections 
FIX allow use of default settings for payment term and condition on proposal creation
 2020-08-27 21:04:10 +02:00
Laurent Destailleur
f997d11761
Update card.php 2020-08-27 21:02:01 +02:00
Laurent Destailleur
7730569dff
Update card.php 2020-08-27 21:00:01 +02:00
Laurent Destailleur
593f3b81e5
Merge pull request #14559 from OPEN-DSI/v10-fix-societe-card-add-sales-representatives 
FIX set sales representatives on create company card
 2020-08-27 20:14:31 +02:00
Laurent Destailleur
f4793f505e
Merge pull request #14532 from StephaneLesage/import-thirdparty-mothercompany-debtlimit-bank-incoterms 
NEW Third-Party Import new fields: mother company,outstanding debt limit,bank account,incoterms
 2020-08-27 20:12:36 +02:00
Laurent Destailleur
9f8d1f0e63
Merge pull request #14520 from TobiasSekan/ShowUserOnExternalCalenderEvents 
NEW Show user on external calender events (when found)
 2020-08-27 20:10:13 +02:00
Laurent Destailleur
b6e9ba8ed6
Merge pull request #14535 from aspangaro/13a6 
Some fix on assets
 2020-08-27 20:01:33 +02:00
Laurent Destailleur
af36f9c784
Merge pull request #14531 from andreubisquerra/master 
NEW: Print payment method and change in TakePOS
 2020-08-27 20:00:34 +02:00
Laurent Destailleur
3b4508b44f
Update paiement.class.php 2020-08-27 19:59:46 +02:00
Laurent Destailleur
5c1680e9c5
Merge branch 'develop' into master 2020-08-27 19:58:29 +02:00
Laurent Destailleur
e95361fed4
Merge pull request #14536 from ptibogxiv/patch-347 
Fix for better code
 2020-08-27 19:57:34 +02:00
Laurent Destailleur
a3e94a670b
Merge pull request #14554 from bb2a/filter_warehous_order 
Remove warehouse search
 2020-08-27 19:56:55 +02:00
Laurent Destailleur
094b2e84a6
Merge pull request #14566 from TobiasSekan/FixEmptyRefInContractListToolTip 
FIX - Empty references in contract service list tool tip
 2020-08-27 19:54:37 +02:00
Laurent Destailleur
829ef1ae0b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-27 19:52:21 +02:00