Commit Graph

88214 Commits

Author SHA1 Message Date
Laurent Destailleur
6e36fba4f3 NEW Development of module Recruitment 2020-07-24 11:54:57 +02:00
Laurent Destailleur
46fccf8eb1 FIX dolGetElementUrl and agenda page for external modules 2020-07-24 11:53:44 +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
195ad9e5fb Fix exclude .back files 2020-07-24 10:21:20 +02:00
Laurent Destailleur
f50fc751ab Trans 2020-07-24 10:02:24 +02:00
Laurent Destailleur
ce3248ab57 Trans 2020-07-24 10:01:05 +02:00
Laurent Destailleur
3109d9c16a Look and feel v13 2020-07-24 09:58:39 +02:00
Laurent Destailleur
afbeb026ab Trans 2020-07-24 09:56:14 +02:00
Laurent Destailleur
aefb1483e3 NEW Can change size of logo on PDF documents 2020-07-24 03:36:44 +02:00
Laurent Destailleur
cf89e159bd Typo 2020-07-24 03:19:37 +02:00
Laurent Destailleur
fa29549976 Fix trans 2020-07-24 03:09:31 +02:00
Laurent Destailleur
895fe63d3b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 01:53:51 +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
a46f4df147 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/clicktodial.php
2020-07-24 00:15:56 +02:00
Laurent Destailleur
26ac4e30d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-24 00:09:46 +02:00
Laurent Destailleur
42234ba506 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/price.lib.php
2020-07-24 00:07:57 +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
ATM john
921e904acc Fix MySQL rank usage for column 2020-07-23 20:34:11 +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
quentin
255bd6b26c FIX null required 2020-07-22 11:54:52 +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
Francis Appels
fe0c37f43d Merge remote-tracking branch 'Dolibarr/12.0' into 12 2020-07-21 09:58:46 +02:00
VERDOL Gauthier
55298317e3 FIX : wrong link to third invoice templates 2020-07-20 16:22:48 +02:00
florian HENRY
734a6de996 Merge branch '11.0' of https://github.com/Dolibarr/dolibarr into 11.0_fix_commerce_MenuSupplierORderOnly 2020-07-20 09:01:30 +02:00
florian HENRY
2c5e96bb28 better fix 2020-07-20 09:01:21 +02:00
Laurent Destailleur
9a506ff9b3 css 2020-07-20 03:29:22 +02:00
Laurent Destailleur
d823bb73c0 Change order of fields for mass stock movement 2020-07-20 01:01:40 +02:00
Laurent Destailleur
9d9f865f37 fetch_optionals must be included into a fetch 2020-07-20 00:24:14 +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
e5688e2641 Fix phpcs 2020-07-19 02:54:25 +02:00
Laurent Destailleur
87cd4b11bd Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-07-19 02:24:38 +02:00
Laurent Destailleur
8d26329653 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop
Conflicts:
	htdocs/core/lib/price.lib.php
	htdocs/projet/activity/perday.php
2020-07-19 02:24:26 +02:00
Laurent Destailleur
acdb61b640
Merge pull request #14227 from defrance/patch-154
NEW : add class for ticket edition (pdf or odt)
2020-07-19 02:11:13 +02:00
Laurent Destailleur
e17fbf9dcd
Merge pull request #14206 from atm-josselin/NEW_show_label_on_batch_card
NEW Show label on batch card
2020-07-19 02:03:46 +02:00
Laurent Destailleur
3c3be1b04f
Merge pull request #14188 from aspangaro/13a1
NEW: Add column quantity in product margin page
2020-07-19 02:02:30 +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