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

76606 Commits

Author SHA1 Message Date
Laurent Destailleur
8aba46a5ed Fix doc 2020-05-27 23:08:33 +02:00
Laurent Destailleur
a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/core/class/html.form.class.php
 2020-05-27 23:07:18 +02:00
Laurent Destailleur
fbaf705c2a Look and feel v12 2020-05-27 22:50:38 +02:00
Anthony Berton
c0b6fd1811
Update html.formproduct.class.php 2020-05-27 22:35:55 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
15f2165c12 Fix work on payment by bank transfer (avoid confusion between record) 2020-05-27 20:14:11 +02:00
Florian Mortgat
d491f2cf54 [pgsql] type of llx_adherent_type.subscription is VARCHAR(3) so quotes are mandatory 2020-05-27 18:27:10 +02:00
kamel
6e10abe427 [NEW] Save filter of the project homepage 
Save the filter into the user parameters
 2020-05-27 15:51:25 +02:00
Laurent Destailleur
ada9c9addc Fix count of records 2020-05-27 15:37:30 +02:00
Laurent Destailleur
7c653c0873 Fix count of records 2020-05-27 15:36:16 +02:00
Laurent Destailleur
2f1e653f2f Fix css 2020-05-27 15:29:09 +02:00
Laurent Destailleur
00e88fcf76 Fix backtourl 2020-05-27 15:26:38 +02:00
Laurent Destailleur
264c1d6491 List website into combo sorted by position, ref fields 2020-05-27 14:50:10 +02:00
Anthony Berton
9efcc631d7
Merge branch 'develop' into Add-option-in-stock-for-affect-warehouse- 2020-05-27 14:47:20 +02:00
Laurent Destailleur
34d7dbe7e9 Fix css 2020-05-27 14:42:17 +02:00
Laurent Destailleur
ceda05a879 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-27 14:39:38 +02:00
Laurent Destailleur
e2680fa29a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2020-05-27 14:39:19 +02:00
Laurent Destailleur
16625af34e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/tpl/filemanager.tpl.php
 2020-05-27 14:28:20 +02:00
Laurent Destailleur
3ef1ca1764 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/ecm/class/ecmfiles.class.php
	htdocs/ecm/index.php
 2020-05-27 14:24:03 +02:00
Laurent Destailleur
a207365bd2 FIX XSS using the renaming of .noexe files - reported by Nolan. 2020-05-27 13:12:18 +02:00
Florian Mortgat
954c29786e FIX 10.0 - pagination in prelevement/bons.php 2020-05-27 12:15:42 +02:00
kamel
54a68d888e Correction Stickler CI 2020-05-27 11:45:04 +02:00
kamel
fe8eddac5e [NEW] Ticket message notifications from public interface 
Can send an email when a new message is added from public interface

 close issue #12181
 2020-05-27 11:39:06 +02:00
Laurent Destailleur
0b48ffe3cd Removed not used var $useglobalvars 2020-05-27 11:38:28 +02:00
andreubisquerra
3b884c4051
Fix travis 2020-05-27 07:03:57 +02:00
andreubisquerra
8891595993
Fix travis 2020-05-27 06:57:12 +02:00
andreubisquerra
896e3166b7
Update phone.css 2020-05-27 06:49:37 +02:00
andreubisquerra
7d323f4379
Update index.php 2020-05-27 06:48:40 +02:00
andreubisquerra
abf7fce108
Update auto_order.php 2020-05-27 06:44:00 +02:00
Laurent Destailleur
479e8ceceb Look and feel v12 2020-05-27 03:19:37 +02:00
Laurent Destailleur
3f4ae8875f Fix bad tooltip 2020-05-27 02:45:09 +02:00
Laurent Destailleur
d3e21c82f2 CSS 2020-05-27 02:38:54 +02:00
Laurent Destailleur
e308170ed8 CSS 2020-05-27 02:38:12 +02:00
Laurent Destailleur
c0ce584487 Look and feel v12 2020-05-27 00:26:04 +02:00
Laurent Destailleur
00484d5938 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 23:23:31 +02:00
Laurent Destailleur
9aeb79e80c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-26 23:22:45 +02:00
Laurent Destailleur
e02aa4e41b FIX Default bank account was not loaded for document generation. 2020-05-26 23:22:14 +02:00
andreubisquerra
7e792928e0
Update invoice.php for Auto Order 2020-05-26 23:03:47 +02:00
andreubisquerra
56708e8c35
Update phone.php for Auto Order 2020-05-26 22:52:55 +02:00
Laurent Destailleur
c607c2daa0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 22:31:47 +02:00
Laurent Destailleur
44273e0570 Fix duplicate code 2020-05-26 22:31:27 +02:00
Laurent Destailleur
91ecd3455f Fix CSS 2020-05-26 22:30:11 +02:00
Laurent Destailleur
da8bd7507e NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
Laurent Destailleur
7ceb236a09 Fix look and field v12 2020-05-26 14:45:45 +02:00
Laurent Destailleur
48137f8cad Fix look and field v12 2020-05-26 14:43:50 +02:00
Laurent Destailleur
d51bf44f55 Add picto 2020-05-26 12:53:58 +02:00
Laurent Destailleur
05ac3de2f0 Enhance search / filter 2020-05-26 12:46:51 +02:00
Laurent Destailleur
2d30d33303 NEW Can filter on container type, language and tags in the list of pages 
of website module.
 2020-05-26 12:25:41 +02:00
atm-quentin
1c45866409 FIX missing accountancy report menu for simple accountancy conf 2020-05-26 10:33:07 +02:00
Laurent Destailleur
b6308f6dfa Fix phpcs 2020-05-26 01:16:18 +02:00
Laurent Destailleur
3aaefd15b0 Fix set of categories 2020-05-26 01:07:43 +02:00
stickler-ci
ce79989a9c Fixing style errors. 2020-05-25 22:33:02 +00:00
Laurent Destailleur
957a265fbd
Merge branch 'develop' into cleanupUserRightsSupplierProposalCard 2020-05-26 00:31:04 +02:00
Laurent Destailleur
714d01bdab
Merge branch 'develop' into CleanupUserRightsForunFactureCard 2020-05-26 00:25:38 +02:00
Laurent Destailleur
5f90596bb7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-26 00:20:36 +02:00
Laurent Destailleur
ab176cd078
Merge pull request #13937 from frederic34/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 
add new rule
 2020-05-26 00:20:12 +02:00
Laurent Destailleur
f9f5beb064 NEW Can set tags/categories to website pages. 2020-05-26 00:19:32 +02:00
Laurent Destailleur
89e32d33a4
Merge pull request #13969 from Dolibarr/revert-13782-free_email 
Revert "NEW enable free emails input with select2"
 2020-05-25 23:13:13 +02:00
Laurent Destailleur
80ace3b52c Revert due to regressions 2020-05-25 23:05:29 +02:00
Laurent Destailleur
a80270ebb5 Revert "clean" 
This reverts commit 7e7a10f8d2.
 2020-05-25 23:01:25 +02:00
Laurent Destailleur
faf7a379ba Revert "clean" 
This reverts commit 8f9ee3250d.
 2020-05-25 23:01:20 +02:00
Laurent Destailleur
d169162ef1
Revert "NEW enable free emails input with select2" 2020-05-25 22:56:29 +02:00
Laurent Destailleur
26eab1f285
Merge pull request #13782 from frederic34/free_email 
NEW enable free emails input with select2
 2020-05-25 22:55:36 +02:00
laurantines
416d1d0301 Update list.php 
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
 2020-05-25 22:53:03 +02:00
Laurent Destailleur
972cb08aa6
Merge pull request #13966 from laurantines/develop 
[FIX] Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
 2020-05-25 22:51:12 +02:00
Laurent Destailleur
4d13fa532f
Merge pull request #13852 from bb2a/MultiPriceInListe 
Add columns for multiprices in product list
 2020-05-25 22:50:16 +02:00
Laurent Destailleur
49c4ed5a08
Update list.php 2020-05-25 22:50:00 +02:00
stickler-ci
5fe4520385 Fixing style errors. 2020-05-25 20:43:35 +00:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
4e0d8ba518
Merge pull request #13962 from andreubisquerra/develop 
TakePOS Auto Order improvements
 2020-05-25 22:34:22 +02:00
Laurent Destailleur
d08fc174c4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:23:51 +02:00
Laurent Destailleur
2fe8e03ed6 Fix missing quote 2020-05-25 22:23:22 +02:00
Laurent Destailleur
41d5d9b6f8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:21:52 +02:00
Laurent Destailleur
ba047428e2 Fix duplicate \n 2020-05-25 22:21:36 +02:00
Laurent Destailleur
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
19bcdb6418 Fix structured data 2020-05-25 22:19:28 +02:00
Laurent Destailleur
02b9ce5901 Fix length of title 2020-05-25 18:16:36 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
26177489c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:46:39 +02:00
Laurent Destailleur
25d1a2a1d8 Restore missing png file 2020-05-25 13:36:56 +02:00
Laurent Destailleur
160ac14eb3 Update logo 2020-05-25 13:32:57 +02:00
Laurent Destailleur
0b9e1e6ec6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 13:01:49 +02:00
Laurent Destailleur
0409ec00d7 CSS 2020-05-25 13:01:32 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
0dbb8224fb Fix logo 2020-05-25 12:50:54 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
laurantines
962d795740
Update list.php 
Search by d,phone, d.phone_perso, d.phone_mobile in SELECT QUERY
 2020-05-25 12:26:05 +02:00
Laurent Destailleur
384e1e31ad Fix Popup 2020-05-25 11:30:57 +02:00
Laurent Destailleur
c67eeeaf6c CSS 2020-05-25 11:30:52 +02:00
Laurent Destailleur
a44f0d24eb Fix Popup 2020-05-25 11:06:16 +02:00
Laurent Destailleur
61545703d1 CSS 2020-05-25 10:58:18 +02:00
Laurent Destailleur
2595f571c7 Fix exclude credit note when searching situation invoice to use for next 2020-05-25 00:21:09 +02:00
Laurent Destailleur
47465f4108 Fix for situation invoice (exclude credit not when searching last 
invoice to use)
 2020-05-25 00:20:00 +02:00
Laurent Destailleur
0041bca82f Fix ambiguous param 2020-05-24 23:49:33 +02:00
Laurent Destailleur
6158e41822 CSS 2020-05-24 23:44:04 +02:00
Laurent Destailleur
aee6fce9f8 Fix remove bad use 2020-05-24 20:04:26 +02:00
andreubisquerra
d60bcb871f
Fix travis 2020-05-24 18:24:41 +02:00
Laurent Destailleur
84ec747109 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-24 18:04:26 +02:00
andreubisquerra
957c40e072
Fix travis 2020-05-24 18:03:07 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
andreubisquerra
3632111705
Fix travis 2020-05-24 17:29:35 +02:00
andreubisquerra
c80989d74f
phone.php improvements 2020-05-24 16:31:22 +02:00
andreubisquerra
221e8d8ce1
invoice.php improvements 2020-05-24 16:30:42 +02:00
andreubisquerra
26ee0d1949
genimg improvements 2020-05-24 16:29:42 +02:00
Laurent Destailleur
65708ec360 Fix responsive 2020-05-24 15:07:57 +02:00
Laurent Destailleur
dacb326c15 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-24 01:10:41 +02:00
Laurent Destailleur
509ce9f571 CSS 2020-05-24 01:09:45 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
4cb0ffeb1f Fix css 2020-05-24 01:04:56 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-24 01:02:08 +02:00
Laurent Destailleur
ef17ed2f87 Look and feel v12 2020-05-24 00:01:52 +02:00
Laurent Destailleur
2b963479a8 Sync transifex 2020-05-23 23:50:00 +02:00
Laurent Destailleur
c843da5272 Sync transifex 2020-05-23 22:29:45 +02:00
Frédéric FRANCE
67b8ab13c9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 21:45:18 +02:00
Frédéric FRANCE
a7e0fe24ff
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-23 21:44:14 +02:00
Frédéric FRANCE
5c78eca68a
prepare new rule 2020-05-23 21:14:44 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Laurent Destailleur
024e62a582 Fix navigation 2020-05-23 20:27:25 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:20:53 +02:00
Laurent Destailleur
fe6453194e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-05-23 20:18:17 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Laurent Destailleur
9fdd718c22 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 20:11:20 +02:00
Laurent Destailleur
40777cbcd9 Fix phpcs 2020-05-23 20:11:10 +02:00
Laurent Destailleur
97a4c32870 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-23 20:09:41 +02:00
Laurent Destailleur
127534ef55 Fix common var name seems to be $objref for subdir of doc 2020-05-23 20:09:31 +02:00
Laurent Destailleur
28bd962559
Merge pull request #13703 from frederic34/entrepotlibelle 
remove deprecated libelle to fix phpunit
 2020-05-23 19:25:04 +02:00
Laurent Destailleur
be641c3d09
Merge pull request #13914 from aspangaro/12.0_a27 
NEW Add employee in expense report binding page
 2020-05-23 19:23:20 +02:00
Laurent Destailleur
d6470519eb
Update list.php 2020-05-23 19:21:03 +02:00
Laurent Destailleur
1ed3b385fa
Update lines.php 2020-05-23 19:19:28 +02:00
Laurent Destailleur
558a441b41
Update lines.php 2020-05-23 19:18:13 +02:00
Laurent Destailleur
e086cdcf2a
Update lines.php 2020-05-23 19:17:09 +02:00
Laurent Destailleur
2ccd6c1e9a
Update lines.php 2020-05-23 19:16:37 +02:00
Laurent Destailleur
6c3a238981
Update lines.php 2020-05-23 19:14:33 +02:00
Laurent Destailleur
173662e98c
Update lines.php 2020-05-23 19:14:05 +02:00
Laurent Destailleur
b10976562f
Merge pull request #13958 from fappels/12_ref_int_deprication 
Fix ref_int deprecation.
 2020-05-23 19:12:21 +02:00
Frédéric FRANCE
6522bb70fd
fix merge 2020-05-23 19:06:01 +02:00
Frédéric FRANCE
48f12c8307
Merge remote-tracking branch 'origin/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:58:18 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
stickler-ci
66637ba0b6 Fixing style errors. 2020-05-23 16:39:06 +00:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Laurent Destailleur
8e113888d8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 17:02:27 +02:00
Laurent Destailleur
64f72daa7e Fix hreflang if canonical page 2020-05-23 17:01:22 +02:00
Francis Appels
efa4ffa326 Fix ref_int deprecation. 
Add to changelog and allow to use ref_ext for shipments.
 2020-05-23 16:46:42 +02:00
Laurent Destailleur
051e009c47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 15:50:25 +02:00
Laurent Destailleur
748a120b71 Show button for categories if module is enabled 2020-05-23 15:50:15 +02:00
Laurent Destailleur
bf0327952b
Merge pull request #13875 from ptibogxiv/patch-339 
NEW Date shipment from order accepts hours
 2020-05-23 15:42:24 +02:00
Laurent Destailleur
9b54ed766b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 15:37:08 +02:00
Laurent Destailleur
aec5200a98 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/variants/class/ProductCombination.class.php
 2020-05-23 15:37:00 +02:00
Laurent Destailleur
7c92bb218e Fix no hreflang if not a canonical page 2020-05-23 15:33:04 +02:00
Laurent Destailleur
4913d10724
Merge branch 'develop' into patch-339 2020-05-23 15:14:06 +02:00
Laurent Destailleur
d8d5907aff
Merge pull request #13939 from grandoc/develop 
Fix : some comment and translation
 2020-05-23 15:11:32 +02:00
Laurent Destailleur
697d4d684e
Merge pull request #13899 from andreubisquerra/master 
TakePOS Auto Order improvements
 2020-05-23 15:11:01 +02:00
Laurent Destailleur
394ea5075f
Merge pull request #13823 from aspangaro/12.0_a25 
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
 2020-05-23 15:07:27 +02:00
Laurent Destailleur
c2b2e17b58
Merge pull request #13917 from atm-quentin/NEW_showfullarbo_in_getnomurl 
NEW conf to allow show full arbo in warehouse getnomurl
 2020-05-23 15:05:08 +02:00
Laurent Destailleur
5bbbabf653
Update stocks.lang 2020-05-23 15:04:59 +02:00
Laurent Destailleur
abe7472ee5
Update stocks.lang 2020-05-23 15:03:57 +02:00
Philippe Grand
af17781b2b
fix : personnal font file within tcpdf 2020-05-23 15:01:40 +02:00
Philippe Grand
6c15ff2ac1
fix : personnal font file within tcpdf 2020-05-23 15:01:25 +02:00
Philippe Grand
d80afa7536
fix : personnal font file within tcpdf 2020-05-23 15:01:08 +02:00
Philippe Grand
f49374c72d
fix : personnal font file within tcpdf 2020-05-23 15:00:48 +02:00
Philippe Grand
20898d783a
fix : personnal font file within tcpdf 2020-05-23 15:00:30 +02:00
Philippe Grand
b1e7085857
fix : personnal font file within tcpdf 2020-05-23 15:00:11 +02:00
Laurent Destailleur
b4ceb2e97e
Update entrepot.class.php 2020-05-23 15:00:06 +02:00
Philippe Grand
462b043efc
fix : personnal font file within tcpdf 2020-05-23 14:59:52 +02:00
Philippe Grand
c9c5dc4ebe
fix : personnal font file within tcpdf 2020-05-23 14:59:30 +02:00
Philippe Grand
60f1bcfb70
fix : personnal font file within tcpdf 2020-05-23 14:59:06 +02:00
Laurent Destailleur
263bfda8bd
Merge pull request #13916 from altatof/tracking 
NEW : add tracking number in list and search_all items
 2020-05-23 14:58:45 +02:00
Laurent Destailleur
4004aeb257
Merge pull request #13915 from atm-quentin/Fix_missing_getnomurl_warehouse_hook 
FIX missing GetNomURL Hook in warehouse class
 2020-05-23 14:57:28 +02:00
Laurent Destailleur
7d8323b0a7
Merge pull request #13920 from altatof/dispatch 
NEW : edit or delete dispatched lines
 2020-05-23 14:56:04 +02:00
Philippe Grand
19598bad8a
fix : personnal font file within tcpdf 2020-05-23 14:41:30 +02:00
Philippe Grand
471d86ff39
fix : personnal font file within tcpdf 2020-05-23 14:41:08 +02:00
Philippe Grand
76e32781a3
fix : personnal font file within tcpdf 2020-05-23 14:40:45 +02:00
Philippe Grand
51db2be3f4
fix : personnal font file within tcpdf 2020-05-23 14:39:56 +02:00
Philippe Grand
fdea4db671
fix : personnal font file within tcpdf 2020-05-23 14:39:18 +02:00
Laurent Destailleur
5f3a82423f Fix regression in look and feel v12 2020-05-23 14:38:37 +02:00
Philippe Grand
0becc47b30
fix : personnal font file within tcpdf 2020-05-23 14:38:26 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove 2020-05-23 14:32:12 +02:00
Laurent Destailleur
4e3fbb9d05
Merge pull request #13912 from TobiasSekan/NewEventMassactionPercent 
NEW mass-actions for the event list view
 2020-05-23 14:26:51 +02:00
Laurent Destailleur
7397806ae7
Update actioncomm.class.php 2020-05-23 14:26:28 +02:00
Laurent Destailleur
b7fbda8d08
Merge pull request #13924 from atm-lena/11.0_AddHook_Massstockmove 
Add Hook "Massstockmove"
 2020-05-23 14:25:12 +02:00
Laurent Destailleur
1e6cc80438
Merge pull request #13923 from atm-gauthier/11.0_rename_bank_releve 
FIX : We must only rename current bank receipt
 2020-05-23 14:24:51 +02:00
Laurent Destailleur
e29d2588cf
Merge pull request #13931 from altatof/fixdispatch 
FIX missing rollbacks on trigger bad return
 2020-05-23 14:24:15 +02:00
Tobias Sekan
babcdfc99a Fix not working default value (re...) 2020-05-23 14:22:40 +02:00
Tobias Sekan
58e32aa2ff Fix not wokring default values for date (re...) 2020-05-23 14:22:30 +02:00
Laurent Destailleur
7463eb2bd0
Merge pull request #13938 from TobiasSekan/FixDefaultDateValuesForInvoice 
FIX not working default date values for new invoices
 2020-05-23 14:21:50 +02:00
Frédéric FRANCE
8b4dcbaa64 Update datapolicycron.class.php 2020-05-23 14:19:28 +02:00
Laurent Destailleur
d8250fdc75
Merge pull request #13934 from frederic34/patch-4 
Update datapolicycron.class.php
 2020-05-23 14:19:12 +02:00
Frédéric FRANCE
3a93dcf2c4 Update paymentloan.class.php 
same picto in loan
 2020-05-23 14:18:47 +02:00
Laurent Destailleur
e2cdbf6cec
Merge pull request #13935 from frederic34/patch-6 
Update paymentloan.class.php
 2020-05-23 14:18:08 +02:00
Laurent Destailleur
1979647650
Merge pull request #13954 from fappels/12_fix_batch 
Fix migration, missing batch update to varchar(128)
 2020-05-23 13:54:12 +02:00
Laurent Destailleur
3a15688f17 FIX #13951 2020-05-23 13:53:47 +02:00
Laurent Destailleur
a9b5feb680
Merge branch 'develop' into keep_child_label_if_modified 2020-05-23 13:51:13 +02:00
Laurent Destailleur
726f86e73d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:49:22 +02:00
Laurent Destailleur
acaab1fd45 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:49:15 +02:00
Laurent Destailleur
83ecbef9bc FIX #13911 #13940 2020-05-23 13:46:37 +02:00
Laurent Destailleur
493becde8b Update list.php 2020-05-23 13:39:06 +02:00
Laurent Destailleur
15de6194c4 Update list.php 2020-05-23 13:38:59 +02:00
gael.langlais
af5de05a31 Change some curly braces #13929 2020-05-23 13:38:50 +02:00
Laurent Destailleur
4884dcd62e
Merge pull request #13950 from Langlais115/fix_some_curly_braces 
Change some curly braces #13929
 2020-05-23 13:37:56 +02:00
Laurent Destailleur
9e95342e2f
Update list.php 2020-05-23 13:36:39 +02:00
Laurent Destailleur
072d8c6222
Update list.php 2020-05-23 13:36:02 +02:00
Laurent Destailleur
b4fa56d07e
Merge pull request #13947 from TobiasSekan/FixDefaultValuesForPaymentOnInvoices 
FIX not working default values for payment on new invoices
 2020-05-23 13:33:01 +02:00
Laurent Destailleur
d4b1485c97 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 13:11:30 +02:00
Laurent Destailleur
755c47f900 Fix save of wrapper missing 2020-05-23 13:10:33 +02:00
Laurent Destailleur
333ae9d496 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-23 12:58:18 +02:00
Laurent Destailleur
aff2872fc1 Fix RSS 2020-05-23 12:57:58 +02:00
Laurent Destailleur
50d063256e NEW Povide a RSS Feed for blogposts 2020-05-23 12:54:06 +02:00
Laurent Destailleur
e947ddba10 Fix RSS feed 2020-05-23 12:51:44 +02:00
Laurent Destailleur
f2c02f5559 FIX Language for RSS 2020-05-23 12:41:06 +02:00
Francis Appels
875230ed13 Fix missing batch update to varchar(128) 2020-05-23 10:23:26 +02:00
stickler-ci
74662d3ecd Fixing style errors. 2020-05-23 08:18:41 +00:00
Philippe Grand
e7c2bd830a
fix merge issue 2020-05-23 10:17:48 +02:00
Philippe Grand
b137775046
fix merge issue 2020-05-23 10:12:14 +02:00
Laurent Destailleur
c460cff01c Fix calculation and add tooltip to understand it. 2020-05-23 01:17:01 +02:00
gael.langlais
dce93197d7 FIX #13908 keep child label if modified by user 2020-05-22 17:58:24 +02:00
gael.langlais
e349b9323f Change some curly braces #13929 2020-05-22 17:42:06 +02:00
Frédéric FRANCE
70995d3499
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 15:03:09 +02:00
Laurent Destailleur
2f8b364454 Code comment 2020-05-22 13:18:47 +02:00
Frédéric FRANCE
0f4f727d18
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-22 08:27:12 +02:00
stickler-ci
2873f4dacf Fixing style errors. 2020-05-22 06:08:12 +00:00
Tobias Sekan
53080be245
fix not working default values for payment 2020-05-22 08:01:29 +02:00
Tobias Sekan
d9a2d2b982
fix not working default values for payment 2020-05-22 08:00:26 +02:00
Laurent Destailleur
38c8ebd627 Add link into toolbar to create website tags 2020-05-22 01:01:27 +02:00
Laurent Destailleur
60f865fbb8 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-22 00:58:27 +02:00
Laurent Destailleur
43103f40a5 Fix make page of categories of web site working 2020-05-22 00:55:34 +02:00
Laurent Destailleur
e81e4032f7 Fix make page of categories of web site working 2020-05-22 00:54:53 +02:00
Maxime Kohlhaas
6b1eef9827 Fix board exepense report to approve 2020-05-22 00:50:13 +02:00
Laurent Destailleur
5d78f6dac5 NEW Add link to edit property from search result of website pages 2020-05-22 00:38:01 +02:00
Maxime Kohlhaas
fb0f31c142 Fix board filters for expense report and holiday 2020-05-22 00:33:30 +02:00
Maxime Kohlhaas
6434f255c3 Fix load_state_board doesn't take parameters 2020-05-22 00:32:55 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Laurent Destailleur
9e295d44f0 Code comment 2020-05-21 17:14:42 +02:00
Frédéric FRANCE
726d7817c4
add new rule 2020-05-21 16:13:46 +02:00
Frédéric FRANCE
37202a54e9
add new rule 2020-05-21 16:04:52 +02:00
Frédéric FRANCE
5940d3705a
add new rule 2020-05-21 16:00:12 +02:00
Frédéric FRANCE
3a786ca766
add new rule 2020-05-21 15:25:42 +02:00
Frédéric FRANCE
623783e948
Merge remote-tracking branch 'origin/Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 15:21:05 +02:00
Frédéric FRANCE
674b0e38c8
add new rule 2020-05-21 15:13:31 +02:00
stickler-ci
459154edc0 Fixing style errors. 2020-05-21 13:11:06 +00:00
Frédéric FRANCE
d9f42f85d1
add new rule 2020-05-21 15:08:14 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c Clean CSS, clean code 2020-05-21 13:06:36 +02:00
Philippe GRAND
c77a1be176 fix comment and add some translation 2020-05-21 11:35:32 +02:00
Philippe GRAND
23282acfbc update 2020-05-21 11:20:01 +02:00
Frédéric FRANCE
85625a46bb
add new rule 2020-05-21 09:35:30 +02:00
Tobias Sekan
44ffb8dbf7
Fix not working default value (re...) 2020-05-21 09:34:20 +02:00
Frédéric FRANCE
f4011520a3
add new rule 2020-05-21 09:31:49 +02:00
Tobias Sekan
2efe3d7da0
Fix not wokring default values for date (re...) 2020-05-21 09:31:06 +02:00
Frédéric FRANCE
ba8cf2b398
add new rule 2020-05-21 09:21:30 +02:00