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

87120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d945ef67e1 FIX Picto of HRM module 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-07-26 20:53:22 +02:00
Laurent Destailleur
353e99c26a Fix look and feel 2020-07-26 19:43:55 +02:00
Laurent Destailleur
cdf7261c7e Fix look and feel 2020-07-26 19:27:29 +02:00
Laurent Destailleur
378c45fe5c Fix look and feel 2020-07-26 19:21:47 +02:00
Laurent Destailleur
dd86c21382 FIX dolGetElementUrl and agenda page for external modules 2020-07-25 03:01:04 +02:00
Laurent Destailleur
573feed66f FIX locataxes lost on lines when cloning a vendor invoice 2020-07-25 02:59:49 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-07-25 00:22:47 +02:00
Laurent Destailleur
1bd00ac775 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-25 00:17:36 +02:00
Laurent Destailleur
960416f9bf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/card.php
 2020-07-25 00:17:28 +02:00
Laurent Destailleur
b82b6736d1 Look and feel 2020-07-24 18:13:01 +02:00
Laurent Destailleur
6d4b113c72 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 14:25:59 +02:00
Laurent Destailleur
d6f1a897f6 Fix size of module box 2020-07-24 13:44:32 +02:00
Laurent Destailleur
f68be08c67
Merge pull request #14198 from Gecka-Apps/12.0-printStdColumnContent-hook-improve 
Improve printStdColumnContent by passing the $pdf object
 2020-07-24 13:20:03 +02:00
Laurent Destailleur
a6e728a4d8
Merge pull request #14246 from fappels/11_fix_date_fourn_price_log 
FIX: date in supplier price log tooltip.
 2020-07-24 13:18:36 +02:00
Laurent Destailleur
4e4e737ff2
Merge pull request #14269 from atm-gauthier/10.0_fix_wrong_invoice_template_link 
FIX : wrong link to third invoice templates
 2020-07-24 13:13:15 +02:00
Laurent Destailleur
fb1c226e56 Init var 2020-07-24 13:05:19 +02:00
Laurent Destailleur
cd5982e45f
Merge pull request #14273 from fbosman/patch-3 
Specific email-adresses for invoice, shipment and order-confirmation
 2020-07-24 12:58:47 +02:00
Laurent Destailleur
ff4ec934e9
Merge pull request #14277 from atm-quentin/fix_warning_total 
FIX warning
 2020-07-24 12:55:24 +02:00
Laurent Destailleur
943e7c988f
Update extrafields_list_print_fields.tpl.php 2020-07-24 12:55:12 +02:00
Laurent Destailleur
c699d71abc
Merge pull request #14281 from ATM-Consulting/11.0_fix_multicurency_option_not_applied 
Fix multicurecy option not applied
 2020-07-24 12:54:27 +02:00
Laurent Destailleur
6261fa191f Prepare compatibilty with mysql 8 2020-07-24 12:47:29 +02:00
stickler-ci
8273dbcd49 Fixing style errors. 2020-07-24 08:39:09 +00:00
Frans Bosman
94498b191b
Update card_presend.tpl.php 2020-07-24 10:37:19 +02:00
Laurent Destailleur
e0d22b739d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/product/stock/class/entrepot.class.php
 2020-07-24 01:53:24 +02:00
Laurent Destailleur
db9fc264d9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-24 01:51:20 +02:00
Laurent Destailleur
34a9eee7a6 Minor fix in translation 2020-07-24 01:50:57 +02:00
Laurent Destailleur
0f4e00a2a3 Fix language 2020-07-24 01:43:03 +02:00
Laurent Destailleur
99935ce11f FIX Should not be able to edit qty on shipment when no stock available 2020-07-24 01:31:07 +02:00
Laurent Destailleur
431b207dab Fix to solve sql error on some databases 2020-07-24 01:02:07 +02:00
Laurent Destailleur
0890b15077 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-24 00:06:30 +02:00
Laurent Destailleur
c6c1830e70 FIX ClickToDial tab of users has disappeared 2020-07-24 00:06:18 +02:00
Laurent Destailleur
e5a16c530d FIX Can go on page even when module disabled 2020-07-23 23:57:12 +02:00
John Botella
55e65bbabf Fix variable init 2020-07-23 11:12:04 +02:00
John Botella
fc1de5b4f3 Fix multicurecy option not applied 2020-07-23 11:10:18 +02:00
quentin
7bc683b234 FIX warning 2020-07-22 15:13:50 +02:00
Frans Bosman
e2592d9049
Update card_presend.tpl.php 
Add hidden options for specific sender email-adress for Invoices, Shipments and Order-confirmations
 2020-07-22 11:44:26 +02:00
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
Laurent Dinclaux
3cdabbaaff Explicitly pass the pdf object by reference in the printStdColumnContent hook call. 2020-07-19 21:53:06 +11:00
Francis Appels
c2030a7db5 jdate already in function listProductFournisseurPriceLog 
So no conversion needed.
 2020-07-19 09:43:15 +02:00
Laurent Destailleur
d598039f20
Merge pull request #14218 from Ahuahuachi/12.0 
Update Mexico City name
 2020-07-19 02:01:12 +02:00
Laurent Destailleur
521c4679d9 FIX #14241 Mysql 8 compatibility 2020-07-19 01:52:30 +02:00
Laurent Destailleur
f26a64fb88 FIX If using a rounding step, localtax1+2 not included in total 2020-07-19 01:47:17 +02:00
Laurent Destailleur
48adeb9dd7 FIX #14256 2020-07-19 01:38:38 +02:00
Laurent Destailleur
6fdd5ea73a Not required 2020-07-19 01:31:51 +02:00
Laurent Destailleur
ee74740384 FIX #14259 2020-07-19 01:29:42 +02:00
Laurent Destailleur
16d486e211 FIX Setup of currency limit and accuracy 2020-07-19 01:03:37 +02:00
Laurent Destailleur
32410b59c4 Code comment 2020-07-19 00:02:02 +02:00
Laurent Destailleur
3069eaa5c0
Merge pull request #14191 from Gecka-Apps/12.0-fix-14181 
[REGRESSION] Fix #14181. Limits and accuracy form not saving modified values.
 2020-07-18 23:59:29 +02:00
Laurent Destailleur
c30491284f Fix phpcs 2020-07-18 23:16:05 +02:00
Abdessalam@MEGALOGI
1e6273b92d Update card.php 
La description d'un produit/service libre (HTML) d'un devis est formatée en texte simple.
 2020-07-18 23:11:17 +02:00