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

18641 Commits

Author SHA1 Message Date
Philippe Grand
74ae90f9da
Update commonobject.class.php 2019-11-01 11:18:12 +01:00
stickler-ci
0c6938aa2a Fixing style errors. 2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502 add some comment 2019-11-01 10:42:14 +01:00
Laurent Destailleur
5b5a2e9804 Clean code 2019-11-01 03:25:09 +01:00
Laurent Destailleur
aa306bf5d4 Debug widgets 2019-10-31 23:50:36 +01:00
Laurent Destailleur
b8803fa8df Work on MO 2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531 Work on MO 2019-10-31 22:46:34 +01:00
Laurent Destailleur
af09c77a0c Fix phpcs 2019-10-31 22:15:18 +01:00
Laurent Destailleur
c215d534fc Fix phpcs 2019-10-31 21:16:41 +01:00
Laurent Destailleur
f98df3c807 NEW Can edit link to the translation page in website module 2019-10-31 21:09:33 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
dcbe7fe8da Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-31 14:06:36 +01:00
Laurent Destailleur
360b3a9550 NEW Ask the new label and new dates in confirm popup when cloning tax 2019-10-31 14:06:26 +01:00
stickler-ci
8765e7648e Fixing style errors. 2019-10-31 11:03:46 +00:00
atm-ph
526aeab9af Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_search_input_on_type_list 2019-10-31 12:02:53 +01:00
John Botella
d0a5e30faa Change btn name 2019-10-31 08:44:08 +01:00
Laurent Destailleur
b296f62671 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
John Botella
0cff122ccd Add file display in ticket 2019-10-30 17:46:18 +01:00
atm-ph
2f68a73a2a New update comments is now available 2019-10-30 15:45:04 +01:00
Marc de Lima Lucio
85cef09e83 FIX: triggers: directories read with opendir() never closed 2019-10-30 14:46:46 +01:00
stickler-ci
ed9a136211 Fixing style errors. 2019-10-30 08:58:19 +00:00
Philippe GRAND
445d09cf8a add comment 2019-10-30 09:50:06 +01:00
Philippe GRAND
a80243e528 add comment 2019-10-30 09:48:34 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019 
add some comment
 2019-10-30 03:17:21 +01:00
Laurent Destailleur
2770f79a86
Merge pull request #12216 from frederic34/patch-5 
css
 2019-10-30 03:02:24 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e
Merge pull request #12240 from frederic34/patch-19 
Update html.formmail.class.php
 2019-10-30 02:57:27 +01:00
Laurent Destailleur
248016cd5d
Merge pull request #12241 from frederic34/contactphone 
Contactphone
 2019-10-30 02:52:11 +01:00
Laurent Destailleur
bf0400a29b
Merge pull request #12252 from oscim/patch-10 
Update admin.lib.php
 2019-10-30 02:41:59 +01:00
Laurent Destailleur
f03bf149bd Fix autoselect of field with modulebuilder 2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50 Enhance modulebuilder 
Work on MO
 2019-10-30 01:35:41 +01:00
Laurent Destailleur
beb85ee3a8 Work on MO 2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234 NEW Add widgets for BOMs and MOs 2019-10-30 00:36:47 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:48:11 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:43:35 +01:00
stickler-ci
52ef2bb990 Fixing style errors. 2019-10-29 10:16:49 +00:00
oscim
d310ca6e82
Update admin.lib.php 
add function modulehelp_prepare_head
 2019-10-29 11:15:03 +01:00
Laurent Destailleur
5e06fe0712 FIX Avoid fatal error when creating thumb from PDF 2019-10-29 11:11:13 +01:00
Frédéric FRANCE
043a71442f
contact phone 2019-10-27 20:06:16 +01:00
Frédéric FRANCE
a9447bc963
Update html.formmail.class.php 2019-10-27 18:08:21 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-27 17:03:50 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
afa3ed499f Can export BOMs 2019-10-27 15:56:20 +01:00
Frédéric FRANCE
e2afcfb999
clean indent 2019-10-27 11:53:20 +01:00
Frédéric FRANCE
e203f87c84
clean indent 2019-10-27 11:18:36 +01:00
Laurent Destailleur
5cb9434bb4 FIX Stock qty hidden without permission to see stock 2019-10-27 00:55:06 +02:00
Laurent Destailleur
e17cc5b2e5 Debug cloning of BOMs 2019-10-27 00:26:11 +02:00
Laurent Destailleur
f060ef1018 FIX Clean decimal data for module builder 2019-10-27 00:01:16 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Frédéric FRANCE
83ed70f72f
Update agenda.lib.php 2019-10-24 22:44:51 +02:00
Laurent Destailleur
2814a5c07b Fix phpcs 2019-10-24 21:47:31 +02:00
Laurent Destailleur
b45ee20696 NEW Add a tab to setup "Opening hours" of company (information only) 2019-10-24 21:29:07 +02:00
Laurent Destailleur
8d21144521 Beautify select of products in vendor record 2019-10-24 20:33:16 +02:00
Philippe GRAND
5e44d63ec0 Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019 2019-10-24 16:24:17 +02:00
Laurent Destailleur
88e848e346 FIX Extrafields missing in export of expense report 2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f FIX Extrafields missing in export of expense report 2019-10-24 15:57:34 +02:00
Philippe GRAND
ac839204d7 add some comment 2019-10-24 15:12:20 +02:00
Philippe GRAND
ffa5c8cbc0 add some comment 2019-10-24 15:10:05 +02:00
stickler-ci
3fb0b1ac73 Fixing style errors. 2019-10-24 13:07:19 +00:00
Philippe GRAND
480e21b88a add some comment 2019-10-24 15:06:56 +02:00
stickler-ci
9eb0385a88 Fixing style errors. 2019-10-24 13:02:34 +00:00
Philippe GRAND
f1db8e6f03 add some comment 2019-10-24 15:02:37 +02:00
stickler-ci
8a7360dd32 Fixing style errors. 2019-10-24 12:59:20 +00:00
Philippe GRAND
96ab43d495 add some comment 2019-10-24 14:58:15 +02:00
Laurent Destailleur
7297514afb NEW Use the gender of member for picto in member lists. 2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727 Fix tooltip on extrafield title was on wrong line. 2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07 Theme v11 2019-10-23 20:12:29 +02:00
Laurent Destailleur
41303006f3 Rename constant 2019-10-23 17:48:55 +02:00
Laurent Destailleur
f4545a2068 Debug method MAIN_STATUS_USES_CSS 2019-10-23 17:31:54 +02:00
Laurent Destailleur
a8ca8c7a1f Fix edit of extrafields link when empty 2019-10-23 16:38:15 +02:00
Laurent Destailleur
9a386da7f5 NEW Can crop/resize image attached on a bank record 2019-10-23 16:07:09 +02:00
Laurent Destailleur
da00591bba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f Fix responsive and bad closing td 2019-10-23 03:50:48 +02:00
Laurent Destailleur
f23804a091 FIX #12152 2019-10-23 03:00:19 +02:00
Laurent Destailleur
fea12076ee FIX #12152 2019-10-22 20:24:52 +02:00
Laurent Destailleur
c4be61c55c FIX Better compatible fix for the trouble of weight / size units 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/card.php
 2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d FIX Better compatible fix for the trouble of weight / size units 2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b Move code of extrafields to the new architecture 2019-10-22 17:08:37 +02:00
Laurent Destailleur
8242281ef8 Close #12096 2019-10-22 14:39:33 +02:00
Laurent Destailleur
5ad7ca5620 Code more generic around setting projet on a card 2019-10-22 13:43:24 +02:00
Laurent Destailleur
b2bbee55f1 Fix phpcs 2019-10-22 12:37:36 +02:00
Laurent Destailleur
2eb5803644
Merge pull request #12196 from bb2a/patch-2 
Update functions.lib.php
 2019-10-22 12:36:47 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop 
Translate documentation and minor code improvement
 2019-10-22 12:32:40 +02:00
Laurent Destailleur
e5ee83ead1
Merge pull request #12194 from grandoc/new_branch_21_10_2019 
internationalization
 2019-10-22 12:31:48 +02:00
Tim Otte
ad51e862e4 Merged 2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204 Requested changes implemented 2019-10-22 11:36:28 +02:00
Laurent Destailleur
aa4afcfe8a NEW Can set a filter on object linked in modulebuilder. 2019-10-22 03:49:09 +02:00
Laurent Destailleur
6aa2ceac1a Fix phpcs 2019-10-22 02:53:29 +02:00
Anthony Berton
5e7d615250
Update functions.lib.php 2019-10-21 21:06:48 +02:00
Laurent Destailleur
8e474701c1 Fix missing token 2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Laurent Destailleur
3024919cd6 fix phpcs 2019-10-21 10:25:23 +02:00
Philippe GRAND
a0303e903a internationalization 2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea internationalization 2019-10-21 09:43:34 +02:00
Laurent Destailleur
6e9f3c3f9d
Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact 
NEW : mass email action on invoice list use billing contact if exists
 2019-10-20 21:45:37 +02:00
Laurent Destailleur
528ded58cf
Merge pull request #12187 from c3do/develop 
NEW Add API to get Country by code and iso
 2019-10-20 21:26:44 +02:00
Alfredo Altamirano
d921b08e5c Translate documentation of translate class 2019-10-20 11:44:07 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
0ede817588
do not ignore lines with mix od tabs and spaces 2019-10-20 16:56:47 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
c3do
4fb0d03500 NEW Add API to get Country by code and iso 2019-10-20 15:25:18 +02:00
Laurent Destailleur
49c101bb77 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8 Clean code 2019-10-20 15:16:40 +02:00
Laurent Destailleur
8ce6197314
Update commondocgenerator.class.php 2019-10-20 14:37:15 +02:00
Laurent Destailleur
1b3d6d749a
Merge pull request #12175 from Shnoulle/develop 
Close #12098 : allow usage of AUTH LOGIN in smtp
 2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361
Update smtps.class.php 2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d
Update smtps.class.php 2019-10-20 13:44:28 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop 
Translation of some function documentation
 2019-10-20 13:31:25 +02:00
Laurent Destailleur
9e7476cd1f
Merge pull request #12171 from grandoc/new_branch_18_10_2019 
Standardization
 2019-10-20 13:30:40 +02:00
Laurent Destailleur
62a8523ccf
Merge pull request #12178 from frederic34/patch-18 
Update functions2.lib.php
 2019-10-20 12:40:34 +02:00
Laurent Destailleur
ff30274a59
Merge pull request #12177 from frederic34/patch-17 
Update box_produits.php
 2019-10-20 12:40:10 +02:00
stickler-ci
66a2dc4994 Fixing style errors. 2019-10-20 09:18:55 +00:00
Frédéric FRANCE
33c35780e0
wip 2019-10-20 11:17:54 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Alfredo Altamirano
9d9961e936 Translate documentation 2019-10-19 16:55:27 -05:00
Alfredo Altamirano
1ede09c21a Fix typo 2019-10-19 11:17:53 -05:00
Frédéric FRANCE
f0a3d1a1c4
Update functions2.lib.php 2019-10-18 23:20:34 +02:00
Frédéric FRANCE
486047c357
Update box_produits.php 2019-10-18 23:14:43 +02:00
Alfredo Altamirano
71f9b4f36b Translation of parameter documentation 2019-10-18 12:55:21 -05:00
Denis Chenu
88100a53aa Close #12098 : allow usage of AUTH LOGIN in smtp 
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
 2019-10-18 17:35:52 +02:00
Laurent Destailleur
becd3f7d2f FIX Missing status and paid flag in export or expense report 2019-10-18 15:35:25 +02:00
Philippe GRAND
a07ab341f8 Standardization 2019-10-18 13:00:31 +02:00
Philippe GRAND
41d2cb2c29 Standardization 2019-10-18 12:56:40 +02:00
Philippe GRAND
f43d51bfec Standardization 2019-10-18 12:51:49 +02:00
Philippe GRAND
731f4587e2 Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019 2019-10-18 12:44:40 +02:00
Philippe GRAND
18b183f516 Standardization 2019-10-18 12:43:25 +02:00
stickler-ci
0c61e798a6 Fixing style errors. 2019-10-18 09:42:15 +00:00
Philippe GRAND
3b56d91727 Standardization 2019-10-18 11:41:18 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3 Clean code for order of modules 2019-10-17 19:21:30 +02:00
Laurent Destailleur
87ec1de78e Start to work on solution to sort permissions by module 2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2 2019-10-17 18:16:57 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right 
Fix Stock movement user's right (Fixes #11967)
 2019-10-17 17:53:17 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
25fe861f9b
Merge pull request #12151 from tuxgasy/10_Product_import_duplicate_volumUnits 
Fix width unit label in product import
 2019-10-17 17:47:31 +02:00
Laurent Destailleur
f71423b3fd
Merge pull request #12160 from grandoc/new_branch_17_10_2019 
Internationalization
 2019-10-17 17:42:44 +02:00
Laurent Destailleur
c64a537bfd
Merge pull request #12155 from frederic34/patch-14 
Update html.formticket.class.php
 2019-10-17 17:42:30 +02:00
Laurent Destailleur
9397407f23
Merge pull request #12149 from grandoc/new_branch_16_10_2019 
internationalization
 2019-10-17 17:41:51 +02:00
Laurent Destailleur
40a9b95696
Merge pull request #12148 from homer8173/patch-7 
use current local time on Now button
 2019-10-17 17:41:16 +02:00
Gildas
132ea56a59 Fix Stock movement user's right (Fixes #11967) 2019-10-17 17:06:38 +02:00
Philippe GRAND
2efeeb0ad8 Internationalization 2019-10-17 14:47:03 +02:00
Laurent Destailleur
084ab53b4b Fix translation 2019-10-17 12:14:38 +02:00
Frédéric FRANCE
46d2bf3317
Update html.formticket.class.php 2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374
Update html.formticket.class.php 2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9
Update html.formticket.class.php 2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php 2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
8a7a0b80e2 Fix remove warnings 2019-10-16 19:08:31 +02:00
Laurent Destailleur
41dd53170e Code comment 2019-10-16 19:07:17 +02:00
Laurent Destailleur
205967976c Can set a BOM to draft 2019-10-16 18:35:15 +02:00
TuxGasy
43ce1543d8 Fix width unit label in product import 2019-10-16 17:37:20 +02:00
Laurent Destailleur
7960c91955 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/theme/md/style.css.php
 2019-10-16 17:27:41 +02:00
Laurent Destailleur
8152c60878 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
 2019-10-16 17:13:14 +02:00
Laurent Destailleur
b47ebcca2b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:10 +02:00
Philippe GRAND
10fd472392 internationalization 2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be internationalization 2019-10-16 15:46:46 +02:00
stickler-ci
fce1f1991c Fixing style errors. 2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55
use current local time on Now button 
use current local time for feed the date according to locale settings
 2019-10-16 14:32:17 +02:00
Laurent Destailleur
7a927a22e3
Merge pull request #12137 from frederic34/patch-15 
Update box_task.php
 2019-10-16 14:31:01 +02:00
Laurent Destailleur
2aa594de9d
Merge pull request #12124 from c3do/patch-1 
New: Set a pricing rule by default for new clean installation
 2019-10-16 13:25:44 +02:00
Laurent Destailleur
d7871c4971
Merge pull request #12132 from grandoc/new_branch_15_10_2019 
Internationalization
 2019-10-16 13:24:10 +02:00
Laurent Destailleur
ea2986037f
Merge pull request #12147 from homer8173/patch-5 
Fix user time instead of server time
 2019-10-16 13:12:37 +02:00
Laurent Destailleur
1d7efbdc64
Merge pull request #12138 from frederic34/patch-16 
FIX datec in box ticket
 2019-10-16 13:02:59 +02:00
stickler-ci
bba042c0c3 Fixing style errors. 2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549
Fix user time instead of server time 
it seems that we want to use a user time by clicking on now button.

IDEA : may i use client time ??? because if page is old, the now button insert an old time.
 2019-10-16 12:28:50 +02:00
Laurent Destailleur
6d05d42c50 Look and feel v11 2019-10-16 11:26:20 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
b0de030f3e phpcs 2019-10-16 02:05:47 +02:00
Laurent Destailleur
ffc4820970 Fix counter of BOM 2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa Mutualize code 2019-10-16 01:36:07 +02:00
Laurent Destailleur
b0355dd149 Module BOM have now status DRAFT, VALIDATED, DISABLED 2019-10-16 01:20:58 +02:00
Laurent Destailleur
9ce71c26aa Use alpha logo by default 2019-10-15 11:41:22 +02:00
Laurent Destailleur
63a60c7811 NEW Add option MAIN_PDF_FORCE_FONT_SIZE 2019-10-15 11:13:14 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Laurent Destailleur
2ed96c9e5f Fix scrutinizer 2019-10-15 02:54:19 +02:00
Laurent Destailleur
a1c93cb2e6 MAIN_ACTIVATE_HTML5 is now always on now (so option removed). 
Look and feel v11
 2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c Removed warning 2019-10-15 00:44:22 +02:00
Frédéric FRANCE
194072fc60
Update box_last_ticket.php 2019-10-15 00:14:43 +02:00
Frédéric FRANCE
a53c7cfca8
Update box_last_modified_ticket.php 2019-10-15 00:13:52 +02:00
Laurent Destailleur
c869cbe193
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature 
Unlock title button feature
 2019-10-14 23:55:10 +02:00
Laurent Destailleur
2d1bc90e57 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:06 +02:00
Frédéric FRANCE
b77d2f2ff2
Update box_task.php 2019-10-14 23:27:37 +02:00
stickler-ci
30099a821b Fixing style errors. 2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33 Internationalization 2019-10-14 21:38:21 +02:00
Philippe GRAND
7ce5ddbf02 Internationalization 2019-10-14 21:25:43 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25 
Remove a duplicate line
 2019-10-14 21:04:22 +02:00
Laurent Destailleur
b8a27a47aa
Merge pull request #12112 from frederic34/patch-17 
Update box_last_modified_ticket.php
 2019-10-14 20:57:18 +02:00
Laurent Destailleur
1fc5afa022
Merge pull request #12111 from frederic34/patch-16 
Update box_last_ticket.php
 2019-10-14 20:56:25 +02:00
Laurent Destailleur
7b1b51e752
Merge pull request #12115 from TobiasSekan/develop 
Fix MS Outlook import error
 2019-10-14 20:54:30 +02:00
Laurent Destailleur
4941a99cc7
Merge pull request #12126 from grandoc/new_branch_14_10_2019 
add missing translation
 2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540
Update pdf_eratosthene.modules.php 2019-10-14 20:53:18 +02:00
Laurent Destailleur
2f0bf491ac
Merge pull request #12130 from frederic34/patch-19 
Update check_notifications.php
 2019-10-14 20:38:40 +02:00
Laurent Destailleur
5c4edad0d4
Merge pull request #12105 from grandoc/new_branch_12_10_2019 
more internationalization
 2019-10-14 20:37:50 +02:00
Frédéric FRANCE
502d154cea
Update check_notifications.php 2019-10-14 20:01:35 +02:00
Laurent Destailleur
3b84e2bac3 Use img-thumb css 2019-10-14 19:21:13 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Philippe GRAND
fd90ebe63b add missing translation 2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245 add missing translation 2019-10-14 15:48:24 +02:00
Cédric
44476afdac
FIX: No pricing rule on new clean installation 
There is no pricing rule on new fresh installation of Dolibarr.
I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.
 2019-10-14 15:35:04 +02:00
Laurent Destailleur
a33fb47777 Work on MO module 2019-10-14 12:10:14 +02:00
Laurent Destailleur
7973b03201 NEW Add estimated duration on the BOM module 2019-10-14 11:38:36 +02:00
Tobias Sekan
e2ca646b6e
Fix MS Outlook import error 2019-10-14 10:22:47 +02:00
Alexandre SPANGARO
e50d32dc00 Remove a duplicate line 2019-10-13 13:20:45 +02:00
Frédéric FRANCE
92e4b962fa
Update box_last_modified_ticket.php 2019-10-13 10:37:30 +02:00
Frédéric FRANCE
67278e4781
Update box_last_ticket.php 2019-10-13 10:18:41 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Frédéric FRANCE
c143584af4
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 21:16:54 +02:00
Laurent Destailleur
c338db6c36 Fix unlink picto 2019-10-12 19:16:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
9ba992b8b6 Work on inventory module 2019-10-12 12:31:35 +02:00
Philippe GRAND
33efd77fc7 more internationalization 2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1 Fix missing price level field 2019-10-11 19:36:36 +02:00
Laurent Destailleur
f334180cb8
Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent 
NEW add parent category id or label in import category module
 2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3
Update modCategorie.class.php 2019-10-11 17:33:13 +02:00
Laurent Destailleur
95305a313d Fix trans 2019-10-11 17:02:35 +02:00
Laurent Destailleur
60bdb3133e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:57:56 +02:00
Laurent Destailleur
b58c2c38b2 Fix missing token 2019-10-11 16:57:47 +02:00
Laurent Destailleur
3f62a6d532
Merge pull request #12093 from frederic34/patch-23 
fix search by roles
 2019-10-11 16:57:33 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
cc73877e03
Merge branch 'develop' into patch-18 2019-10-11 16:32:48 +02:00
Laurent Destailleur
541357027e
Merge pull request #12077 from frederic34/patch-15 
globe fontawesome
 2019-10-11 16:31:37 +02:00
Laurent Destailleur
d6881f9192
Merge pull request #12095 from atm-john/develop_fix_logo_bg 
Fix logo container css name and add hidden conf to remove background
 2019-10-11 16:25:48 +02:00
Laurent Destailleur
a0f918c85a
Merge pull request #12094 from grandoc/new_branch_11_10_2019 
fix some translations
 2019-10-11 16:21:06 +02:00
Laurent Destailleur
dbb06adf98
Merge pull request #12090 from frederic34/patch-19 
doxygen
 2019-10-11 16:15:36 +02:00
Laurent Destailleur
78bfc8997d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/link.class.php
 2019-10-11 16:12:01 +02:00
Laurent Destailleur
114e741975
Merge pull request #12079 from frederic34/patch-17 
Update box_factures_imp.php
 2019-10-11 15:54:37 +02:00
Laurent Destailleur
c6a796d270 Try to fix #12097 2019-10-11 15:45:32 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
7ce01c5ceb Look and feel v11 2019-10-11 14:42:55 +02:00
John Botella
1fdc38da2f Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fix_logo_bg 2019-10-11 14:36:48 +02:00
Laurent Destailleur
c21224ef96 Align code of auguria menu handler with new architecture 2019-10-11 14:24:47 +02:00
Laurent Destailleur
9251f04d63 Update thumbs of themes 2019-10-11 13:26:48 +02:00
Laurent Destailleur
5801d09dbe NEW Use the squarre logo as favicon of pages 2019-10-11 12:28:13 +02:00
VESSILLER
2fb776ee34 NEW add new rule fetchidfromcodeandlabel for categories import 2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7 update code 2019-10-11 10:19:58 +02:00
Philippe Grand
bcb7365a5a
Update commondocgenerator.class.php 2019-10-11 10:13:21 +02:00
John Botella
4873cbd071 Fix css name 2019-10-11 10:10:12 +02:00
John Botella
13115a55a2 Fix logo background and hidden conf 2019-10-11 10:02:59 +02:00
Philippe GRAND
af88f44fd9 fix some translations 2019-10-11 09:51:17 +02:00
John Botella
9194eb4bec Fix block title height if no button 2019-10-11 09:14:10 +02:00
John Botella
724999f1ce Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature 2019-10-11 08:40:43 +02:00
Frédéric FRANCE
c80d055af3
fix search by roles 2019-10-10 23:51:54 +02:00