Laurent Destailleur
|
0f0e4feeaf
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/modSociete.class.php
|
2020-09-17 19:33:29 +02:00 |
|
Laurent Destailleur
|
caaf0d370a
|
Fix #yogosha4474
|
2020-09-17 19:01:01 +02:00 |
|
Laurent Destailleur
|
28fad93fb7
|
Typo
|
2020-09-17 17:30:44 +02:00 |
|
Got2be
|
03f37f3c1f
|
NEW : add hooks on stats pages
|
2020-09-17 17:00:58 +02:00 |
|
Laurent Destailleur
|
eae5410ced
|
Protect md file
|
2020-09-17 16:57:39 +02:00 |
|
ptibogxiv
|
cbd511fbb4
|
Update list.php
|
2020-09-17 16:16:35 +02:00 |
|
Laurent Destailleur
|
d04d1d1499
|
Use note_private instead of note
|
2020-09-17 16:13:57 +02:00 |
|
Laurent Destailleur
|
d73642559c
|
Fix
|
2020-09-17 15:31:16 +02:00 |
|
Laurent Destailleur
|
5a22a07637
|
css
|
2020-09-17 15:30:20 +02:00 |
|
Laurent Destailleur
|
dbf8ed2fec
|
Fix output
|
2020-09-17 15:29:13 +02:00 |
|
Laurent Destailleur
|
6bcc1d65eb
|
Always hide hash
|
2020-09-17 15:28:16 +02:00 |
|
Laurent Destailleur
|
f575c503f1
|
Fix css
|
2020-09-17 15:21:59 +02:00 |
|
Laurent Destailleur
|
e123a4cb84
|
Fix help on minimum nb of chars
|
2020-09-17 15:09:29 +02:00 |
|
Laurent Destailleur
|
7cc75ac873
|
Fix: removing also " when removing " from a received parameter.
|
2020-09-17 14:43:58 +02:00 |
|
Laurent Destailleur
|
9a758b7edd
|
FIX #yogosha4483
|
2020-09-17 14:31:25 +02:00 |
|
Laurent Destailleur
|
31a68cfc18
|
FIX #yogosha4483
|
2020-09-17 14:30:10 +02:00 |
|
Laurent Destailleur
|
16b9e62866
|
FIX #yogosha4456
|
2020-09-17 14:20:37 +02:00 |
|
Tim Otte
|
f5c0cd25e2
|
Fixed html to odt converter
|
2020-09-17 13:19:31 +02:00 |
|
Laurent Destailleur
|
8029b80f08
|
Fix install hangs
|
2020-09-17 13:03:34 +02:00 |
|
Laurent Destailleur
|
2f100fdf79
|
Fix alpha into alphanohtml
|
2020-09-17 12:53:58 +02:00 |
|
Laurent Destailleur
|
0bf0312d50
|
FIX #yogosha4448
|
2020-09-17 12:30:14 +02:00 |
|
Laurent Destailleur
|
33cefacf91
|
Fix missing global
|
2020-09-17 12:17:14 +02:00 |
|
ptibogxiv
|
8284d0ee06
|
FIx product list
fix mistake if fk_state empty
|
2020-09-17 11:41:53 +02:00 |
|
Laurent Destailleur
|
05636c39bd
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-17 11:39:58 +02:00 |
|
Laurent Destailleur
|
939433706b
|
FIX #yogosha4465
|
2020-09-17 11:37:41 +02:00 |
|
Laurent Destailleur
|
5daba4b0ed
|
Merge pull request #14752 from ptibogxiv/patch-360
NEW filter product list by country and/or state/province
|
2020-09-17 11:21:23 +02:00 |
|
Laurent Destailleur
|
5e3f6ce736
|
Merge pull request #14749 from TobiasSekan/UseNewTableFunctionAndCleanup
Use new table function for comm/propal + cleanup
|
2020-09-17 11:20:31 +02:00 |
|
Laurent Destailleur
|
5d8b9056b4
|
Merge pull request #14755 from atm-lena/10.0_FIX_SendMailFromAContact
FIX - Send mail from contact : select mail model
|
2020-09-17 11:15:58 +02:00 |
|
Laurent Destailleur
|
d92e482841
|
FIX #yogosha transversal path when unzipping file
|
2020-09-17 11:09:43 +02:00 |
|
Laurent Destailleur
|
004ba33695
|
Fix cach call of useNPR()
|
2020-09-17 10:11:06 +02:00 |
|
Alexandre SPANGARO
|
bc457ebb66
|
Stickler
|
2020-09-16 21:22:59 +02:00 |
|
Alexandre SPANGARO
|
23c4cfe913
|
FIX Yogosha report 4425 (backport)
|
2020-09-16 20:55:28 +02:00 |
|
Laurent Destailleur
|
4630887591
|
Fix css
|
2020-09-16 20:09:40 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
47031cb656
|
Fix phpcs
|
2020-09-16 18:51:19 +02:00 |
|
Laurent Destailleur
|
295c2b1d17
|
FIX #yogosha4435
|
2020-09-16 17:56:26 +02:00 |
|
Laurent Destailleur
|
7b8a206730
|
FIX #yogosha
|
2020-09-16 17:48:59 +02:00 |
|
atm-lena
|
3182537566
|
FIX - Send mail from contact : select mail model
|
2020-09-16 17:19:25 +02:00 |
|
Laurent Destailleur
|
1fd633ed21
|
FIX #yogosha4433
|
2020-09-16 16:34:19 +02:00 |
|
Laurent Destailleur
|
dec73da206
|
FIX #yogosha4430
|
2020-09-16 16:17:02 +02:00 |
|
Laurent Destailleur
|
d0c02f3714
|
FIX #yogosha4426
|
2020-09-16 14:51:46 +02:00 |
|
Laurent Destailleur
|
d7aa376c3c
|
FIX Yogosha report 4425
|
2020-09-16 14:37:05 +02:00 |
|
Sekan, Tobias
|
91641e593f
|
MAIN_DASHBOARD_USE_TOTAL_HT + more clean
|
2020-09-16 14:03:41 +02:00 |
|
Laurent Destailleur
|
09558d0ce9
|
Fix MAIN_OPTIMIZEFORTEXTBROWSER
|
2020-09-16 13:15:57 +02:00 |
|
ptibogxiv
|
6f564c1937
|
NEW filter product list by country and/or state/province
|
2020-09-16 12:34:07 +02:00 |
|
Laurent Destailleur
|
40acd8a386
|
Fix missing field canvas
|
2020-09-16 12:17:33 +02:00 |
|
stickler-ci
|
be27617e68
|
Fixing style errors.
|
2020-09-16 09:11:01 +00:00 |
|
Sekan, Tobias
|
ac1fdb4a59
|
Use new table function for comm/propal + cleanup
|
2020-09-16 10:51:19 +02:00 |
|
Laurent Destailleur
|
382a4552eb
|
Fix css
|
2020-09-16 03:39:03 +02:00 |
|
Laurent Destailleur
|
a3492dfb5b
|
Clean code
|
2020-09-16 03:15:31 +02:00 |
|
Laurent Destailleur
|
adeed1464d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-16 02:56:09 +02:00 |
|
Laurent Destailleur
|
baa46cd502
|
Fix syntax error
|
2020-09-16 02:53:44 +02:00 |
|
Laurent Destailleur
|
ffa91451eb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-16 02:50:36 +02:00 |
|
Laurent Destailleur
|
e5191cad24
|
Move code of incoterm into the Incoterm Trait.
|
2020-09-16 02:50:18 +02:00 |
|
Laurent Destailleur
|
4224e5da41
|
Merge pull request #14729 from bafbes/abb120143
allow access to adherent_extrafields table fields in printFieldListWhere hook
|
2020-09-16 01:14:01 +02:00 |
|
Laurent Destailleur
|
06a73539fe
|
Merge pull request #14731 from ATM-Consulting/12.0_FIX_round_virtual_stock_value_on_reassort_list
FIX 12.0 - round value of virtual stock on product stock reassort list
|
2020-09-16 01:12:34 +02:00 |
|
Laurent Destailleur
|
2da4838141
|
Merge pull request #14730 from ptibogxiv/patch-358
NEW get state dictionnary by REST API
|
2020-09-16 01:12:08 +02:00 |
|
Laurent Destailleur
|
584a02bc9a
|
Update api_setup.class.php
|
2020-09-16 01:11:47 +02:00 |
|
Laurent Destailleur
|
b7d56cbfbf
|
Fix syntax error
|
2020-09-16 01:09:54 +02:00 |
|
Laurent Destailleur
|
ed8b4100c8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-16 01:07:08 +02:00 |
|
Laurent Destailleur
|
b690bab1a8
|
Fix regression: missing column
|
2020-09-16 01:06:54 +02:00 |
|
Laurent Destailleur
|
d954de2d35
|
Merge pull request #14732 from ptibogxiv/patch-359
NEW add State/Province origin for products
|
2020-09-16 01:02:00 +02:00 |
|
stickler-ci
|
b3f78100bf
|
Fixing style errors.
|
2020-09-15 23:01:00 +00:00 |
|
Laurent Destailleur
|
9e494d0bb3
|
Update card.php
|
2020-09-16 00:59:23 +02:00 |
|
Laurent Destailleur
|
52c9e7230f
|
Merge pull request #14734 from inoveaconseil/NEW_Scope_Oauth_Google
New scope oauth google
|
2020-09-16 00:55:10 +02:00 |
|
Laurent Destailleur
|
b5cac258bf
|
Merge pull request #14739 from defrance/patch-155
Users can now have non-binary gender
|
2020-09-16 00:54:07 +02:00 |
|
Laurent Destailleur
|
81d71589d9
|
Merge pull request #14743 from cfoellmann/minor-fix-bydates
fix for broken table on dispatch when hiding sellby/eatby dates
|
2020-09-16 00:53:03 +02:00 |
|
Laurent Destailleur
|
c152f8d76f
|
Merge branch 'develop' into patch-4
|
2020-09-16 00:52:16 +02:00 |
|
Laurent Destailleur
|
6a0c924fa8
|
Merge pull request #14738 from aspangaro/13a18
Debugbar - Move to Font Awesome 5 Free
|
2020-09-16 00:50:36 +02:00 |
|
Laurent Destailleur
|
7e941ff5ac
|
Merge pull request #14747 from daraelmin/develop
FIX #14746 Historical list of subscription shows empty member type
|
2020-09-16 00:49:41 +02:00 |
|
Laurent Destailleur
|
5c31593d43
|
Add date of birth in candidatures
|
2020-09-16 00:47:44 +02:00 |
|
daraelmin
|
8b928a110e
|
FIX #14746
Historical list of subscription shows empty member type if not recorded
|
2020-09-15 22:23:22 +02:00 |
|
Alexandre SPANGARO
|
e0c3977728
|
Debugbar - Move to Font Awesome 5 Free
|
2020-09-15 22:21:00 +02:00 |
|
Alexandre SPANGARO
|
c474484262
|
Revert "Debugbar - Move to Font Awesome 5 Free"
This reverts commit 1b5873af1f.
|
2020-09-15 22:10:24 +02:00 |
|
Frédéric FRANCE
|
070f9a0c89
|
uniformise scan_dir to scandir in admin supplier payments
|
2020-09-15 16:32:32 +02:00 |
|
Laurent Destailleur
|
7bcf2c9089
|
css
|
2020-09-15 14:45:51 +02:00 |
|
Christian Foellmann
|
c869f8fe5f
|
fix for broken table on dispatch when hiding sellby/eatby dates
|
2020-09-15 14:19:02 +02:00 |
|
Laurent Destailleur
|
51963f4c2a
|
css
|
2020-09-15 13:48:48 +02:00 |
|
Laurent Destailleur
|
afc6155783
|
FIX sign of amount with credit note and multicurrencies
|
2020-09-15 13:30:59 +02:00 |
|
Laurent Destailleur
|
cc24e9b155
|
Look and feel v13
|
2020-09-15 13:27:48 +02:00 |
|
Laurent Destailleur
|
5ca8141cd8
|
Typo
|
2020-09-15 12:09:48 +02:00 |
|
Laurent Destailleur
|
9a9b7ecb95
|
CSS
|
2020-09-15 12:07:15 +02:00 |
|
BENKE Charlene
|
1d0dc7cab0
|
Update list.php
|
2020-09-15 11:31:29 +02:00 |
|
BENKE Charlene
|
b01a68abef
|
Update card.php
|
2020-09-15 11:30:47 +02:00 |
|
Laurent Destailleur
|
522676d745
|
Merge pull request #14737 from aspangaro/13a17
Time to enable fontawesome icons on weather feature
|
2020-09-15 11:29:28 +02:00 |
|
Laurent Destailleur
|
3fd041e861
|
Update functions.lib.php
|
2020-09-15 11:28:49 +02:00 |
|
Laurent Destailleur
|
3dfa9acbef
|
CSS
|
2020-09-15 11:18:57 +02:00 |
|
Laurent Destailleur
|
7a28972c8a
|
FIX sign of amount of invoice lines for credit note with multicurrency
FIX Add INVOICE_POSITIVE_CREDIT_NOTE_SCREEN to solve PT requirement
|
2020-09-15 11:18:21 +02:00 |
|
BENKE Charlene
|
0aa97a8b02
|
Update main.lang
|
2020-09-15 10:59:07 +02:00 |
|
BENKE Charlene
|
be704ef5e8
|
Update list.php
|
2020-09-15 10:57:48 +02:00 |
|
BENKE Charlene
|
0765fff355
|
Update card.php
|
2020-09-15 10:51:09 +02:00 |
|
Laurent Destailleur
|
cb5afc1842
|
CSS
|
2020-09-15 10:18:54 +02:00 |
|
Alexandre SPANGARO
|
1b5873af1f
|
Debugbar - Move to Font Awesome 5 Free
|
2020-09-15 04:05:26 +02:00 |
|
Alexandre SPANGARO
|
4137e92430
|
Time to enable fontawesome icons on weather feature
|
2020-09-15 03:42:35 +02:00 |
|
Laurent Destailleur
|
b7b1de4580
|
Fix position of GPAO must be after Product.
CSS
|
2020-09-15 02:41:08 +02:00 |
|
Laurent Destailleur
|
bd577e253a
|
Fix phpcs
|
2020-09-14 22:31:57 +02:00 |
|
Laurent Destailleur
|
6dd1f522eb
|
CSS
|
2020-09-14 22:30:22 +02:00 |
|
Laurent Destailleur
|
7712b277a6
|
Look and feel v13
|
2020-09-14 21:55:25 +02:00 |
|
Laurent Destailleur
|
cf423add2e
|
Reminders visible on edit page too
|
2020-09-14 21:09:48 +02:00 |
|
Laurent Destailleur
|
59c10235b5
|
Show reminders on the event page
|
2020-09-14 21:06:40 +02:00 |
|
Laurent Destailleur
|
f626bd70d0
|
Look and feel v13
|
2020-09-14 20:53:42 +02:00 |
|
Laurent Destailleur
|
7cbc621f6b
|
css
|
2020-09-14 19:00:18 +02:00 |
|
Laurent Destailleur
|
cc37f4b29c
|
Clean code. <input name="token" value="$_SESSION['newtoken']" is now
forbidden by CI. You must use newToken().
|
2020-09-14 16:24:02 +02:00 |
|
Florian Mortgat
|
06d31e8b9a
|
FIX: missing entity check
|
2020-09-14 16:09:45 +02:00 |
|
stickler-ci
|
b39b9e4227
|
Fixing style errors.
|
2020-09-14 13:19:26 +00:00 |
|
Nicolas
|
ee4e209e7c
|
NEW Oauth SCOPE for Admin SDK
|
2020-09-14 15:12:57 +02:00 |
|
Laurent Destailleur
|
8afd448def
|
Add warning if a hidden option is on to encourage to remove it.
|
2020-09-14 15:05:35 +02:00 |
|
Laurent Destailleur
|
f6555a9077
|
Look and feel v12
|
2020-09-14 14:46:38 +02:00 |
|
Laurent Destailleur
|
550cec06a4
|
Look and feel v12
|
2020-09-14 14:41:11 +02:00 |
|
Laurent Destailleur
|
33d61333b1
|
Fix picto
|
2020-09-14 12:50:07 +02:00 |
|
Laurent Destailleur
|
604a807ac0
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-14 12:48:00 +02:00 |
|
Laurent Destailleur
|
6117e0d8d7
|
Fix tooltip into tooltip
|
2020-09-14 12:47:43 +02:00 |
|
stickler-ci
|
ad84aaacc6
|
Fixing style errors.
|
2020-09-14 09:01:11 +00:00 |
|
ptibogxiv
|
92aab677e9
|
Update product.class.php
|
2020-09-14 10:59:09 +02:00 |
|
ptibogxiv
|
de31920f28
|
NEW add state origin for product
usefull for food, fruits or vegetables or regional product
soon in other PR i will push filter by state or country in product list
|
2020-09-14 10:57:51 +02:00 |
|
ptibogxiv
|
f09655ec6c
|
Update api_setup.class.php
|
2020-09-14 10:53:38 +02:00 |
|
Florian Mortgat
|
4c6b0ed5b5
|
FIX 12.0 - round value of virtual stock on product stock reassort list
|
2020-09-14 10:49:44 +02:00 |
|
stickler-ci
|
75a9678086
|
Fixing style errors.
|
2020-09-14 08:48:04 +00:00 |
|
ptibogxiv
|
e98ae029e3
|
Update cstate.class.php
|
2020-09-14 10:46:19 +02:00 |
|
ptibogxiv
|
557a6863ba
|
NEW get state by REST API
|
2020-09-14 10:45:20 +02:00 |
|
stickler-ci
|
3de5e0f957
|
Fixing style errors.
|
2020-09-14 02:30:37 +00:00 |
|
Scrutinizer Auto-Fixer
|
73915d51c8
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-14 02:30:04 +00:00 |
|
Laurent Destailleur
|
22edd650d3
|
Fix phpcs
|
2020-09-14 04:24:35 +02:00 |
|
Laurent Destailleur
|
c0ef7e8f13
|
fix phpcs
|
2020-09-14 04:23:14 +02:00 |
|
Laurent Destailleur
|
814f07d316
|
Missing picto property
|
2020-09-14 04:11:12 +02:00 |
|
Laurent Destailleur
|
b20be7074e
|
phpcs
|
2020-09-14 04:08:11 +02:00 |
|
Laurent Destailleur
|
7ca9fd9dce
|
Fix merge
|
2020-09-14 03:49:31 +02:00 |
|
Laurent Destailleur
|
dd06ff3a0d
|
Label
|
2020-09-14 03:41:18 +02:00 |
|
Laurent Destailleur
|
419ac91a7a
|
FIX #14538
|
2020-09-14 03:34:03 +02:00 |
|
Laurent Destailleur
|
78a999e6f3
|
css
|
2020-09-14 02:57:43 +02:00 |
|
Laurent Destailleur
|
bd8185fb49
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-09-14 02:49:35 +02:00 |
|
Laurent Destailleur
|
59bc8ee07c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/stats/byproperties.php
htdocs/adherents/stats/geo.php
htdocs/admin/system/dolibarr.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_title.tpl.php
htdocs/langs/en_US/admin.lang
htdocs/product/class/product.class.php
|
2020-09-14 02:49:19 +02:00 |
|
Laurent Destailleur
|
701b83db38
|
FIX Bad number of subscription (forgotten when member was resiliated)
|
2020-09-14 02:38:12 +02:00 |
|
Laurent Destailleur
|
b2288ad2d9
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-09-14 02:33:00 +02:00 |
|
Laurent Destailleur
|
a891211f78
|
Fix bad link
|
2020-09-14 02:32:30 +02:00 |
|
Laurent Destailleur
|
c40ec37b60
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-09-14 02:13:43 +02:00 |
|
Laurent Destailleur
|
c3ba8f7843
|
Better translation
|
2020-09-14 02:13:27 +02:00 |
|
Laurent Destailleur
|
3cb77d2e75
|
Merge pull request #14704 from aspangaro/13a12
New Accountancy - Add default account for customer deposit
|
2020-09-14 01:13:17 +02:00 |
|
Laurent Destailleur
|
dad02afa22
|
Update accountancy.lang
|
2020-09-14 01:13:07 +02:00 |
|
Laurent Destailleur
|
970995d728
|
Clean code. Replace num_paiement with num_payment everywhere.
|
2020-09-14 01:03:51 +02:00 |
|
Laurent Destailleur
|
a2df666d34
|
Standardize code
|
2020-09-14 00:41:31 +02:00 |
|
Laurent Destailleur
|
62b7a90ea3
|
Merge pull request #14723 from c3do/patch-13
NEW API Can update a payment
|
2020-09-14 00:29:10 +02:00 |
|
Laurent Destailleur
|
e9d0869383
|
Update api_invoices.class.php
|
2020-09-14 00:28:43 +02:00 |
|
Laurent Destailleur
|
dcdce246b1
|
Update api_invoices.class.php
|
2020-09-14 00:26:16 +02:00 |
|
Laurent Destailleur
|
cdf071ea10
|
Merge pull request #14717 from bafbes/abb120142
allow external users to see thirdparties with printFieldListWhere hook.
|
2020-09-14 00:23:26 +02:00 |
|
Laurent Destailleur
|
26b4fb3e68
|
Update list.php
|
2020-09-14 00:22:58 +02:00 |
|
Laurent Destailleur
|
1015d3c026
|
Merge pull request #14716 from 99Deon/develop
fix bug in "llx_c_ticket_category.sql" table .
|
2020-09-14 00:17:16 +02:00 |
|
Laurent Destailleur
|
18b20a5587
|
Merge pull request #14721 from indelog/12.0
Fix: getLabelOfUnit() for Product, CommonObjectline to print long label
|
2020-09-14 00:16:38 +02:00 |
|
Laurent Destailleur
|
d0698735d6
|
Update product.class.php
|
2020-09-14 00:14:25 +02:00 |
|
Laurent Destailleur
|
0d9d9498e2
|
Update commonobjectline.class.php
|
2020-09-14 00:13:12 +02:00 |
|