lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80,093 Commits 43 Branches 150 Tags 886 MiB
7297514afb
Commit Graph

70285 Commits

Author SHA1 Message Date
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php 2019-10-16 22:56:29 +02:00
Frédéric FRANCE
8761b46e21
Update bookkeeping.class.php 2019-10-16 22:31:34 +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
012ddd1cdc Fix bom 2019-10-16 18:37:26 +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
93aa7e208d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-16 17:10:19 +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
andreubisquerra
8f03813aa9 Phone layout and functional improvements 2019-10-16 16:26:00 +02:00
Laurent Destailleur
c2788eb427 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-16 16:18:01 +02:00
Laurent Destailleur
75a47eebe0 Fix Method fetchAll must NEVER be used for table with more than 1000 
record
 2019-10-16 16:17:51 +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
c69e934f9c
Merge pull request #12135 from c3do/patch-1 
NEW Can update product type with update method
 2019-10-16 14:28:21 +02:00
Laurent Destailleur
4ca9fddfcc
Update product.class.php 2019-10-16 14:26:49 +02:00
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
Laurent Destailleur
f88733f46a Html code simplest 2019-10-16 14:14:32 +02:00
Laurent Destailleur
dd97a2e666 CSS 2019-10-16 14:11:11 +02:00
Laurent Destailleur
86e4ca55df Merge 2019-10-16 14:04:54 +02:00
Laurent Destailleur
226e5d81b6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-16 14:02:24 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Tobias Sekan
741627897e
fix interchanged allocation 2019-10-16 13:56:11 +02:00
Laurent Destailleur
9663205601 FIX css (some buttons not aligned) 2019-10-16 13:55:29 +02:00
Laurent Destailleur
8da0cd4a35
Merge branch 'develop' into patch-13 2019-10-16 13:32:31 +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
363000f5b9
Merge pull request #12140 from ptibogxiv/patch-268 
NEW mode for list thirdparty API (add easy filter for supplier only)
 2019-10-16 13:25:05 +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
7d965e8b92
Merge pull request #12139 from frederic34/patch-17 
translation for ORDER_SUPPLIER_DELETEInDolibarr
 2019-10-16 13:22:46 +02:00
Laurent Destailleur
a57b456aa6
Merge pull request #12143 from frederic34/patch-19 
NEW Add location into event tooltip. Use full day for fullday events
 2019-10-16 13:21:55 +02:00
Laurent Destailleur
81cb88721a
Merge pull request #12146 from aspangaro/10.0_p27 
Fix - Accountancy - Various payment - Subledger is not recovered in bank journal
 2019-10-16 13:19:46 +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
a376fc4b3c
Merge pull request #12145 from frederic34/patch-21 
Update mo.class.php
 2019-10-16 13:03:12 +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
Laurent Destailleur
a9e57fa2b2 Clean page 2019-10-16 12:32:26 +02:00
Laurent Destailleur
e1521b6c7d Fix phpcs 2019-10-16 12:31:44 +02: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
517fcf45d1 Look and feel v11 2019-10-16 11:23:06 +02:00
Juanjo Menent
5a1682509b FIX It is not possible to create an expedition if there is no unit data 2019-10-16 11:11:34 +02:00
Alexandre SPANGARO
4bb1677079 Fix - Accountancy - Various payment - Subledger is not recovered in bank journal 2019-10-16 10:39:35 +02:00
Frédéric FRANCE
42d8f276fc
Update mo.class.php 2019-10-16 08:17:13 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
fc90916de9 Look and feel v11 2019-10-16 03:17:53 +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
12f1962085 Better error message when module file is corrupted 2019-10-16 00:40:42 +02:00
Frédéric FRANCE
ccd9da99f4
Update list.php 2019-10-15 20:11:15 +02:00
Laurent Destailleur
d2eeb9e749 Wor kon BOM 2019-10-15 19:59:16 +02:00
Laurent Destailleur
e94d47daf7 Work on MRP module 2019-10-15 19:57:23 +02:00
Frédéric FRANCE
6a8e8907ef
Update list.php 2019-10-15 17:55:07 +02:00
Tobias Sekan
199fb3be0f
Fix non-numeric value encountered on ical export 2019-10-15 14:29:27 +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
ptibogxiv
0d69ae9e8c
NEW mode for list thirdparty API (add supplier) 
add new mode for more universel use of the api and easy switch between customer's and supplier's modes
 2019-10-15 09:52:14 +02:00
Frédéric FRANCE
00bac9e989
Update interface_50_modAgenda_ActionsAuto.class.php 
Update agenda.lang

Update agenda.lang

Update interface_50_modAgenda_ActionsAuto.class.php
 2019-10-15 09:38:24 +02:00
Laurent Destailleur
33cc0c017c responsive 2019-10-15 04:20:51 +02:00
Laurent Destailleur
568faef7f4 Fix encoding of message 2019-10-15 04:08:34 +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
Laurent Destailleur
415379c4f2 Link show tutorial in middle 2019-10-15 00:27:09 +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
65b6bc26ba Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/list.php
 2019-10-14 23:54:24 +02:00
Laurent Destailleur
ee5fdc3239 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 23:52:58 +02:00
Laurent Destailleur
0fe3159a8a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/fourn/facture/list.php
 2019-10-14 23:52:46 +02:00
Laurent Destailleur
6662b00575 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-10-14 23:50:40 +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
Laurent Destailleur
540f20c18f css 2019-10-14 23:49:26 +02:00
Frédéric FRANCE
b77d2f2ff2
Update box_task.php 2019-10-14 23:27:37 +02:00
Cédric
3429cb7c1d
New: Update product type with update method 2019-10-14 22:42:38 +02:00
Cédric
2257706a30
New: Update product type with update method 2019-10-14 22:22:20 +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
Frédéric FRANCE
b88059433c
Update list.php 2019-10-14 21:36:38 +02:00
Philippe GRAND
7ce5ddbf02 Internationalization 2019-10-14 21:25:43 +02:00
Laurent Destailleur
0d4866c38c
Merge pull request #12118 from iouston/patch-3 
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
 2019-10-14 21:23:59 +02:00
Laurent Destailleur
176436ec34
Update document.php 2019-10-14 21:23:52 +02:00
Laurent Destailleur
3038a49818
Merge pull request #12117 from iouston/patch-7 
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
 2019-10-14 21:23:13 +02:00
Laurent Destailleur
e5e94f5e7a
Update document.php 2019-10-14 21:23:08 +02:00
Laurent Destailleur
9f61bd23ce
Merge pull request #12127 from atm-josselin/FIX_product_batch_fields_definition 
Fix : add fields definition in product batch class
 2019-10-14 21:22:24 +02:00
Laurent Destailleur
ee393f0550
Merge pull request #12122 from iouston/patch-5 
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
 2019-10-14 21:21:11 +02:00
Laurent Destailleur
15d4a18599
Update document.php 2019-10-14 21:21:04 +02:00
Laurent Destailleur
6106d74568
Merge pull request #12121 from iouston/patch-4 
NEW: Add 2 hidden options to set the default sorting (sort and order) on document page
 2019-10-14 21:20:30 +02:00
Laurent Destailleur
c8d3aea18a
Update document.php 2019-10-14 21:20:17 +02:00
Laurent Destailleur
516d943d1b
Merge pull request #12120 from iouston/patch-6 
Update document.php
 2019-10-14 21:18:33 +02:00
Laurent Destailleur
3866ac6036
Update document.php 2019-10-14 21:18:22 +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
d87a1e39a6
Merge pull request #12110 from aspangaro/10.0_holiday 
lang file for holidays is holiday
 2019-10-14 21:03:55 +02:00
Laurent Destailleur
f3c627cb7f
Merge pull request #12109 from frederic34/patch-15 
keep a copy of object for trigger
 2019-10-14 21:03:35 +02:00
Laurent Destailleur
3432147385
Merge pull request #12099 from prietojc/patch-11 
FIX: Update card.php
 2019-10-14 21:02:04 +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
ebd8bc3645
Merge pull request #12107 from frederic34/patch-14 
Update list.php
 2019-10-14 20:57:01 +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
1f672221ec
Merge pull request #12106 from frederic34/patch-13 
avoid ErrorBadValueForParamNotAString if not configured
 2019-10-14 20:55:06 +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
0d21e61673
Merge pull request #12116 from frederic34/patch-18 
fix travis
 2019-10-14 20:53:42 +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
2e7cc67f9c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-10-14 20:42:28 +02:00
Laurent Destailleur
056f7f826b Clean code 2019-10-14 20:41:28 +02:00
Laurent Destailleur
5d02763288
Merge pull request #12129 from cyrilus/develop 
ADD option MAIN_DONT_KEEP_NOTE_ON_CLONING to remove note on cloning
 2019-10-14 20:39:08 +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
Laurent Destailleur
ed0e090d91
Merge pull request #12123 from atm-greg/FIX_blocked_log_missing_lib 
add security.lib.php for dol_hash
 2019-10-14 20:37:19 +02:00
Frédéric FRANCE
45b3d623bb
Update list.php 2019-10-14 20:30:31 +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
Laurent Destailleur
dbdc62b028 Fix td 2019-10-14 18:41:46 +02:00
stickler-ci
4b7987374b Fixing style errors. 2019-10-14 14:46:04 +00:00
Laurent Destailleur
e0c6c95958 css 2019-10-14 16:07:54 +02:00
Laurent Destailleur
dba9450b01 css 2019-10-14 16:03:12 +02:00
Laurent Destailleur
28339920b3 Translation 2019-10-14 16:00:03 +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
atm-josselin
4f10009113 Add fields definition in product batch class for extrafields compatibility 2019-10-14 15:39:38 +02:00
Laurent Destailleur
5056d7220b Fix multicurrency not yet supported on contracts 2019-10-14 15:36:28 +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
atm-greg
92c624daf0 add security.lib.php for dol_hash 2019-10-14 15:28:06 +02:00
iouston
83b4f41eb5
Update document.php 
add 2 hidden options for set a default field sort and a default order on a document page
 2019-10-14 15:15:34 +02:00
iouston
6ebdce8a9d
Update document.php 
add 2 hidden options for set a default field and a default order on document page
 2019-10-14 15:13:07 +02:00
iouston
f6aafea33c
Update document.php 
add 2 hidden options for set a default field and a defaut order on document page
 2019-10-14 15:09:59 +02:00
Laurent Destailleur
0cd451ef1a Fix show duration in list of services 2019-10-14 15:06:21 +02:00
iouston
720245422e
Update document.php 
add 2 hidden options for sort files on document page
 2019-10-14 15:04:49 +02:00
iouston
0a9cc96564
Update document.php 
Add 2 hidden options for set by default a sort (sort and order) on document page
 2019-10-14 15:01:57 +02:00
Laurent Destailleur
9922ff39ca Fix show duration in list of services 2019-10-14 15:01:37 +02:00
Laurent Destailleur
f9f4faa0d2 css 2019-10-14 14:54:30 +02:00
Laurent Destailleur
0b19c4ff95 css 2019-10-14 14:53:22 +02:00
Laurent Destailleur
369f29b1f3 css 2019-10-14 14:51:44 +02:00
Laurent Destailleur
84c00a0133 css 2019-10-14 14:44:14 +02:00
Frédéric FRANCE
4e52276d1f
fix travis 2019-10-14 13:14:02 +02:00
Laurent Destailleur
4fd12e22cb Fix trans export 2019-10-14 12:27:44 +02:00
Laurent Destailleur
a33fb47777 Work on MO module 2019-10-14 12:10:14 +02:00
Laurent Destailleur
ef09da8794 Fix CSRF check 2019-10-14 11:45:13 +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
Laurent Destailleur
323f31d832 Trans frequency 2019-10-13 20:54:00 +02:00
Laurent Destailleur
f91b98d326 Add frequency in template invoice popup 2019-10-13 20:50:03 +02:00
Laurent Destailleur
9efc5a1b9d Fix extension 2019-10-13 15:00:07 +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
352df8241e
Update api_thirdparties.class.php 2019-10-13 06:19:40 +02:00
Frédéric FRANCE
0ae1e8c2a9
Update api_users.class.php 2019-10-13 06:17:57 +02:00
Frédéric FRANCE
809d98129f
Update api_thirdparties.class.php 2019-10-13 06:14:45 +02:00
Frédéric FRANCE
9eaad23564
Update api_contacts.class.php 2019-10-13 06:12:53 +02:00
Frédéric FRANCE
f6a2fd6eb8
Update card.php 2019-10-13 06:08:32 +02:00
Frédéric FRANCE
2d3a6d2108
Update card.php 2019-10-13 06:05:21 +02:00
Frédéric FRANCE
bb21d048f4
keep a copy of object for trigger 2019-10-12 22:08:11 +02:00
Laurent Destailleur
33f6206031 NEW Add link to export target of emailings into a CSV file. 2019-10-12 20:12:24 +02:00
Laurent Destailleur
c338db6c36 Fix unlink picto 2019-10-12 19:16:36 +02:00
Frédéric FRANCE
b424fc6e27
Update list.php 2019-10-12 18:57:08 +02:00
Laurent Destailleur
650cd2b54f Prepare 10.0.3 2019-10-12 18:41:33 +02:00
Laurent Destailleur
9c94ffeea9 Fix css 2019-10-12 18:40:41 +02:00
Frédéric FRANCE
cef935468d
Update list.php 2019-10-12 18:40:39 +02:00
Laurent Destailleur
67d76787eb Add new hidden conf VARIANT_ALLOW_STOCK_MOVEMENT_ON_VARIANT_PARENT 2019-10-12 15:29:06 +02:00
Laurent Destailleur
9871dd8770 Debug variants 2019-10-12 15:27:06 +02:00
Laurent Destailleur
bcc41c2a33 NEW Can filter on description on bank account transaction lists. 2019-10-12 13:19:10 +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
Laurent Destailleur
dccfdad9dd Work on inventory feature 2019-10-12 11:32:47 +02:00
Laurent Destailleur
9b8e6a3664 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-12 04:51:51 +02:00
Laurent Destailleur
71227e43fa Debug stripe deprecated page 2019-10-12 04:51:41 +02:00
Laurent Destailleur
5474e40db6
Merge pull request #12103 from frederic34/patch-14 
In list of mailing, the ref of emailing is clickable
 2019-10-12 03:30:53 +02:00
Frédéric FRANCE
849eda2023
Update index.php 2019-10-12 00:05:26 +02:00
Frédéric FRANCE
c3e8aec07c
fix translation for showemailing 
in lang files, it's ShowEMailing not ShowEmailing
 2019-10-11 23:54:05 +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
f345b5fdb0 Fix look and feel v10 2019-10-11 19:32:45 +02:00
Laurent Destailleur
dfaf2ae34b Trans 2019-10-11 19:20:52 +02:00
Laurent Destailleur
51383ce6af FIX Reset of password can use email like the login. 2019-10-11 18:42:07 +02:00
JC Prieto
d109341ebe
Update card.php 
Variable $mesg not do anything
 2019-10-11 18:08:15 +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
1fadb2dfb6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 17:24:17 +02:00
Laurent Destailleur
d9dde34ba6 Fix phpcs 2019-10-11 17:24:02 +02:00
Laurent Destailleur
56bfbd8b80
Merge pull request #12086 from ptibogxiv/patch-267 
NEW contacts type dictionnary in api_setup.class.php
 2019-10-11 17:21:22 +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
Laurent Destailleur
b276abea26 Fix missing token in form 
Fix date lost after search
 2019-10-11 16:49:58 +02:00
Laurent Destailleur
b41f7274dd
Merge pull request #12085 from aspangaro/11.0_accounting 
NEW : Accountancy - List by account - Modify sortfield, nowrap on amo…
 2019-10-11 16:39:09 +02:00
Laurent Destailleur
fbc4e3b441
Update listbyaccount.php 2019-10-11 16:37:10 +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
85b4403bb9
Merge branch 'develop' into patch-14 2019-10-11 16:30:50 +02:00
Laurent Destailleur
d9e434965a
Update list.php 2019-10-11 16:29:44 +02:00
Laurent Destailleur
7b81ffe3fe
Update list.php 2019-10-11 16:29:16 +02:00
Laurent Destailleur
55cd960d38
Merge pull request #12078 from frederic34/patch-16 
Update fournisseur.commande.class.php
 2019-10-11 16:27:22 +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
7f503fa98d
Merge pull request #12071 from ptibogxiv/patch-266 
NEW: support Net Measure in product's card.php
 2019-10-11 16:16:33 +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
520a2652e1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:10:21 +02:00
Laurent Destailleur
b5a2d37315 Fix phpunit of BOM 2019-10-11 16:10:09 +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
7ea0af4067 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:38 +02:00
Laurent Destailleur
2a07ecf659 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-10-11 15:53:30 +02:00
Laurent Destailleur
112a074c82
Merge pull request #12074 from aspangaro/11.0_LDcompta 
Update new LDCompta export
 2019-10-11 15:53:10 +02:00
Laurent Destailleur
c6a796d270 Try to fix #12097 2019-10-11 15:45:32 +02:00
Laurent Destailleur
777c297353 FIX #12054 2019-10-11 15:42:27 +02:00
Laurent Destailleur
85a4bac9e0 Better translation 2019-10-11 15:22:12 +02:00
Laurent Destailleur
868bfb518b FIX #11702 FIX #12088 2019-10-11 15:08:10 +02:00
Laurent Destailleur
c3aba5f1a3 FIX #12083 2019-10-11 14:53:30 +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
60395f2a9c NEW Look and feel v11: Some setup pages are by default on edit mode 2019-10-11 14:09:26 +02:00
Laurent Destailleur
96dad08db7 Fix option ADD_UNSPLASH_LOGIN_BACKGROUND 2019-10-11 13:51:07 +02:00
Laurent Destailleur
89161910ff NEW Look and feel v11: Some setup pages are by default on edit mode 2019-10-11 13:45:51 +02:00
Laurent Destailleur
9251f04d63 Update thumbs of themes 2019-10-11 13:26:48 +02:00
Laurent Destailleur
992b92978e NEW Use the squarre logo as favicon of pages 2019-10-11 12:38:01 +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
Laurent Destailleur
4db57f53f9 typo 2019-10-11 11:39:33 +02:00
Laurent Destailleur
ab8199f71a Fix avoid deletion of file if we still need it 2019-10-11 11:38:49 +02:00
Laurent Destailleur
fc886b9950 css 2019-10-11 11:29:39 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +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
535a09e856 Fix block title height if no button MD 2019-10-11 09:17: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
Laurent Destailleur
e7f56b67d8 Look and feel v11 2019-10-10 23:00:33 +02:00
Laurent Destailleur
fce07cf8ca CSS 2019-10-10 22:52:11 +02:00
Laurent Destailleur
5dc6e7d1a0 CSS 2019-10-10 22:45:04 +02:00
Laurent Destailleur
f82f4162c3 NEW Look and fill v11: Introduce CSS "trforbreak" 2019-10-10 22:42:23 +02:00
Laurent Destailleur
3bf6fac505 NEW Can filter on label on invoice in accounting vendor binding pages 2019-10-10 22:05:34 +02:00
Frédéric FRANCE
9a2fabff6f
doxygen 2019-10-10 18:42:29 +02:00