ksar
f2b39b3eeb
FIX #18767 : Adherent delete
...
Adherent Delete was not working due to the fact that
$features = 'adherent';
$feature2 = 'cotisation';
And $user->rights->$feature->$subfeature->supprimer does not exist
Also I used the double declaration of salaries.
2021-09-21 11:27:41 +02:00
lmarcouiller
a7ff9d4889
Fix : KM articles in public/ticket/create_ticket.php
2021-09-21 11:26:49 +02:00
Alexandre SPANGARO
76f7efc193
Missing language key
2021-09-21 03:08:43 +02:00
Yannick Warnier
35e70e7936
Fix method visibility
2021-09-20 23:58:38 +02:00
Yannick Warnier
348c1c4caa
Fix empty assignation line
2021-09-20 23:57:49 +02:00
stickler-ci
d919ef9c4c
Fixing style errors.
2021-09-20 17:57:10 +00:00
Yannick Warnier
c40b22facd
Add turnover homepage box
2021-09-20 19:41:13 +02:00
Laurent Destailleur
deb1965cd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
Laurent Destailleur
c75fbb7642
FIX fetch of product with modulebuilder load too much data
2021-09-20 16:00:11 +02:00
Laurent Destailleur
0eff2fa15b
FIX default language defined for IN country
2021-09-20 13:20:54 +02:00
Laurent Destailleur
360e3290b5
typo
2021-09-20 04:20:20 +02:00
Laurent Destailleur
14c8bdce1a
Better desciption of option
2021-09-19 19:25:38 +02:00
Laurent Destailleur
a747c71cf5
css
2021-09-19 19:19:28 +02:00
Laurent Destailleur
1d597e8a72
Fix add unset* action as sensible GET actions
2021-09-19 18:03:38 +02:00
Laurent Destailleur
96436cac3d
FIX unprivileged user can attach agenda with leave.
2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239
Fix case of newtoken()
2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a
Fix add action delete* as sensitive action
2021-09-18 22:04:41 +02:00
Laurent Destailleur
62b721a904
Add deletecontact as sentitive action
...
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
30fb0d65bd
Merge pull request #18745 from Hystepik/develop#1
...
Fix actions_addupdatedelete.inc.php on lang
2021-09-18 16:09:04 +02:00
Laurent Destailleur
061cbc4266
Merge pull request #18750 from maksimstojkovic/develop
...
Fix Warehouse PDF Generation Error
2021-09-18 16:08:16 +02:00
Laurent Destailleur
39d55b11b4
Merge pull request #18753 from maksimstojkovic/fix-movement-typo
...
Fix typo in pdf_standard.modules.php
2021-09-18 16:07:41 +02:00
Laurent Destailleur
052511d081
Fix sql error
2021-09-18 15:05:31 +02:00
Laurent Destailleur
5fa62f25fa
Fix registration of attendee
2021-09-18 12:39:26 +02:00
Laurent Destailleur
b1c6a6e8d1
Fix show/hide combo when next combo has no item inside.
2021-09-17 19:38:55 +02:00
Laurent Destailleur
68a391b395
Fix not empty second level combo if first one not yet defined
2021-09-17 19:19:41 +02:00
Laurent Destailleur
7ed9e21266
Fix sql error
2021-09-17 19:16:46 +02:00
Maksim Stojkovic
d69ef7c134
Fix typo in pdf_standard.modules.php
2021-09-18 03:12:13 +10:00
Laurent Destailleur
91cd991828
Simplify the selectgroupTicket.
2021-09-17 16:52:42 +02:00
Maksim Stojkovic
44ff73f5de
Remove unused $nblines assignment
...
Fixes the following warning received when attempting to generate a warehouse stock document using the default template:
`count(): Parameter must be an array or an object that implements Countable in /var/www/html/core/modules/stock/doc/pdf_standard.modules.php on line 211`.
$nblines is subsequently assigned on line 326, after which it is then used.
2021-09-17 23:50:00 +10:00
Gauthier PC portable 024
e6c9627195
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-09-17 15:47:23 +02:00
Lucas Marcouiller
e7a32834b7
Fix actions_addupdatedelete.inc.php on lang
2021-09-17 12:55:09 +02:00
Laurent Destailleur
0ae8403fb4
Merge pull request #18690 from lainwir3d/add_rest_api_key_modify_right
...
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-17 12:10:03 +02:00
Laurent Destailleur
fdcd523c55
Merge branch 'develop' into develop#1
2021-09-17 11:59:20 +02:00
Lucas Marcouiller
20e8dd4c54
Fix error on html.for.class on ismultientitymanaged test
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-09-17 11:30:45 +02:00
Lucas Marcouiller
0191e3b6ea
Fix error on html.for.class on ismultientitymanaged test
2021-09-17 11:23:16 +02:00
stickler-ci
46e8f1bebf
Fixing style errors.
2021-09-17 10:59:42 +02:00
antonin_tdj
5f19291285
Avoir Error 19 Constraint Violation (in case of password unchanged)
2021-09-17 10:59:35 +02:00
antonin_tdj
8f3ff32c82
fix ldap passw bug with activedirectory
...
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
2021-09-17 10:59:09 +02:00
Laurent Destailleur
20b50993bb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-17 10:57:15 +02:00
Laurent Destailleur
6a73fc6e44
Merge pull request #18724 from ibuiv/patch-1
...
Fix ldap passw bug with activedirectory
2021-09-17 10:54:05 +02:00
Laurent Destailleur
1a705adf6e
Merge pull request #18726 from cfoellmann/PR/button-classes
...
add missing css classes to buttons
2021-09-17 10:52:13 +02:00
Laurent Destailleur
775544d47d
Merge pull request #18727 from Hystepik/develop#4
...
Close #18677 : new show articles of KM
2021-09-17 10:51:38 +02:00
Laurent Destailleur
3a8a813c4e
Merge pull request #18730 from esion-net/patch-2
...
NEW Expose bank account holder, label and number
2021-09-17 10:50:11 +02:00
Laurent Destailleur
bed697c98d
Merge pull request #18732 from esion-net/patch-2
...
NEW Expose bank account holder, label and number
2021-09-17 10:49:51 +02:00
Laurent Destailleur
7cbb7d7f44
Merge pull request #18733 from esion-net/patch-3
...
NEW Expose bank account holder, label and number
2021-09-17 10:48:52 +02:00
Laurent Destailleur
02bed7ce01
Fix sanitize
2021-09-17 10:45:59 +02:00
Florian HENRY
47efccad75
remove debug
2021-09-16 17:13:34 +02:00
Florian HENRY
820a007731
NEW: add MRP into Object Linked Box
2021-09-16 17:10:06 +02:00
Florian
b9e637a2b2
Expose bank account holder, label and number
...
NEW Expose bank account holder, label and number
2021-09-16 15:52:19 +02:00
Florian
3091448d1a
Expose bank account holder, label and number
...
Useful for automated texts on invoices to have those values available as well.
2021-09-16 15:40:25 +02:00
Laurent Destailleur
49ef24edcb
Fix trans
2021-09-16 15:16:18 +02:00
Laurent Destailleur
b70764af88
Fix translation of ticket categories
2021-09-16 15:08:04 +02:00
Laurent Destailleur
e9a3cca609
Fix lang file
2021-09-16 14:50:38 +02:00
Laurent Destailleur
1177e86f2e
Fix language of group of tickets
2021-09-16 14:46:14 +02:00
Laurent Destailleur
d9751704c8
Fix ambiguous field
2021-09-16 14:37:38 +02:00
Laurent Destailleur
086754e149
Fix translation of category codes
2021-09-16 14:31:20 +02:00
Laurent Destailleur
8909702619
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/bom/class/bom.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/eventorganization.lang
htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
lmarcouiller
04a024570c
update fetchKnowledge and html.formticket
2021-09-16 13:19:43 +02:00
Laurent Destailleur
9918873719
Better log
2021-09-16 13:07:02 +02:00
Christian Foellmann
fd1d4d9073
add missing css classes to buttons
2021-09-16 11:33:42 +02:00
stickler-ci
9d3b680259
Fixing style errors.
2021-09-16 07:31:23 +00:00
antonin_tdj
8c1b3efc47
Avoir Error 19 Constraint Violation (in case of password unchanged)
2021-09-16 09:31:00 +02:00
Laurent Destailleur
aab8d4a628
css
2021-09-16 02:24:25 +02:00
Laurent Destailleur
b1cb32c743
Fix some sql
2021-09-15 20:03:38 +02:00
antonin_tdj
2c73c19bd5
fix ldap passw bug with activedirectory
...
Fix to avoid LDAP Error: 53 (Unwilling to perform) on Samba4 AD
2021-09-15 18:26:32 +02:00
lmarcouiller
b26e9be36f
Close #18677 : new show articles of KM
2021-09-15 15:36:57 +02:00
Laurent Destailleur
6dbf316e66
Fix links
2021-09-14 17:56:06 +02:00
Laurent Destailleur
21462d0b82
Fix can reset filter in setup
2021-09-14 17:24:53 +02:00
lmarcouiller
4762fd9c2e
Close #18678 : Implemention of tags/categories KM
2021-09-13 11:22:55 +02:00
Laurent Destailleur
ce9a10bd90
Fix description of some options
2021-09-13 03:43:25 +02:00
Laurent Destailleur
bbacb4e740
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-13 02:45:00 +02:00
stickler-ci
e424df6447
Fixing style errors.
2021-09-12 12:15:33 +00:00
lainwir3d
2fe85f2a86
CLOSE #18689 REST API module: add api key generate / modify right.
2021-09-12 15:47:56 +04:00
Laurent Destailleur
ce33f39bb0
Clean code. Menu must be greyed in get_menudiv
2021-09-11 15:43:26 +02:00
Laurent Destailleur
c005a20cc0
Fix ldap with ssl
2021-09-11 03:27:59 +02:00
Laurent Destailleur
f8b1e4d482
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-10 20:56:15 +02:00
Laurent Destailleur
edb1f31a19
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2021-09-10 20:55:52 +02:00
Laurent Destailleur
9dcf3e49d0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2021-09-10 20:50:34 +02:00
Laurent Destailleur
2f4463c983
FIX Collapsing of extrafields has disappeared.
2021-09-10 20:49:22 +02:00
Laurent Destailleur
5d512243b8
Merge pull request #18683 from FHenry/14_fix_search_evt_tab
...
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 19:57:12 +02:00
Laurent Destailleur
4bbda0115c
Merge pull request #18682 from vincentjdc/product-price-in-product-select
...
Add product-id and price-id in dataset of product select
2021-09-10 19:51:24 +02:00
Laurent Destailleur
3980e4a32b
Merge pull request #18681 from FHenry/14_fix_extrafield_separator_type
...
fix: show display/hide icon on extrafield type separator
2021-09-10 19:49:26 +02:00
Laurent Destailleur
d50c518b70
Merge pull request #18676 from FHenry/14_fix_ajax_company_ambious_column
...
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
2021-09-10 19:49:12 +02:00
Laurent Destailleur
ae5b5defd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-10 17:17:07 +02:00
Laurent Destailleur
a1e51e212e
Array of fields accept 'tdcss' property
2021-09-10 17:16:42 +02:00
Florian HENRY
257686c2fe
fix: on Event tabs, if no evt type use in filter, filter on label and state not apply
2021-09-10 15:45:03 +02:00
Vincent Dieltiens
b3984798ba
Add product-id and price-id in dataset of product select
2021-09-10 15:32:16 +02:00
Florian HENRY
f3a555ec69
fix: show display/hide icon on extrafield type separator
2021-09-10 15:17:09 +02:00
Christian Foellmann
29820f446d
fix import of product desc without wrong linebreaks
2021-09-10 13:37:42 +02:00
Laurent Destailleur
6f3170494f
Merge pull request #18673 from cfoellmann/PR/input-desc
...
fix import of product desc without wrong linebreaks
2021-09-10 13:36:45 +02:00
Florian HENRY
ef888d5fca
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_fix_ajax_company_ambious_column
2021-09-10 13:26:05 +02:00
Florian HENRY
c66181a00e
fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken
2021-09-10 13:25:40 +02:00
Laurent Destailleur
11b6259130
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/langs/en_US/admin.lang
2021-09-10 11:40:45 +02:00
Christian Foellmann
e5192de9f2
fix import of product desc without wrong linebreaks
2021-09-10 11:36:08 +02:00
Laurent Destailleur
6a296bf6c2
Debug setup
2021-09-10 10:18:46 +02:00
Laurent Destailleur
d382e8d8c9
Clean setup and translation
2021-09-10 09:21:37 +02:00
Laurent Destailleur
875b93aff2
Merge branch 'develop' into 15a8
2021-09-09 19:26:01 +02:00
Laurent Destailleur
ffd7f60830
FIX #18589 #18617
2021-09-09 19:21:32 +02:00
Laurent Destailleur
fa28621709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/reception/list.php
2021-09-09 16:11:29 +02:00
Laurent Destailleur
4d5621ea6f
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-09 14:59:12 +02:00
Laurent Destailleur
f1758b6f0c
Merge pull request #18623 from atm-gauthier/14.0_fix_salary_extrafields
...
14.0 fix salary extrafields are no more available
2021-09-09 14:58:54 +02:00
fr69400
ad0c4c518f
Update row.php
...
right write doesn't exist for supplier_proposal
->line order dont works
2021-09-09 14:42:43 +02:00
Laurent Destailleur
402757bdfe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-09 14:41:51 +02:00
Laurent Destailleur
3581c37b83
Merge pull request #18626 from fr69400/develop
...
FIX : line reorder dont work on supplier_proposal
2021-09-09 14:41:30 +02:00
Laurent Destailleur
cbe08183ac
Merge pull request #18648 from atm-gauthier/NEW_mass_delete_objects
...
NEW : mass action delete, no more break if at least one object has child
2021-09-09 14:38:49 +02:00
Laurent Destailleur
d9cdddd688
Update actions_massactions.inc.php
2021-09-09 14:35:19 +02:00
Laurent Destailleur
7eba2f6f39
Code comment
2021-09-09 14:32:59 +02:00
stickler-ci
1e8870eb95
Fixing style errors.
2021-09-09 09:30:29 +00:00
Gauthier PC portable 024
4e78a24a13
FIX : if delete return < 0, we break and rollback, if == 0, we set event message warning and we test other objects of list
2021-09-09 11:25:46 +02:00
stickler-ci
dd7f6b6a5c
Fixing style errors.
2021-09-09 08:17:52 +00:00
jpb
91e624fd5d
change test
2021-09-09 10:14:39 +02:00
Laurent Destailleur
9fe9d0e9bf
Merge pull request #18630 from hregis/fix_wrong_table_element_line
...
FIX wrong table_element_line
2021-09-09 04:59:27 +02:00
Laurent Destailleur
ac8dfb2dd5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-09-09 04:41:55 +02:00
Laurent Destailleur
d42492c67b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
2021-09-09 04:41:39 +02:00
Laurent Destailleur
6d7cb01951
Merge pull request #18645 from atm-adrien/FIX_add_token
...
FIX : Add token to remove error when removing widget
2021-09-09 04:31:03 +02:00
Laurent Destailleur
e4a7903700
Merge pull request #18657 from moreauftheobald/14.0_fiix_knowledgemanagement_menu
...
Fix: Enable Knowledge Management Menu
2021-09-09 03:23:26 +02:00
Laurent Destailleur
61d5152209
Update eldy.lib.php
2021-09-09 03:23:04 +02:00
Laurent Destailleur
348fe00ffb
Merge pull request #18653 from Hystepik/develop_v14#2
...
Fix permission for salaries module
2021-09-09 03:02:34 +02:00
Laurent Destailleur
ad9bf27bea
Clean code
2021-09-09 02:26:49 +02:00
Laurent Destailleur
034c5651c8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/eventorganization/class/conferenceorbooth.class.php
htdocs/langs/en_US/eventorganization.lang
htdocs/public/eventorganization/attendee_subscription.php
2021-09-08 22:13:35 +02:00
Laurent Destailleur
e0fa4e4b5c
Fix phpcs
2021-09-08 21:19:01 +02:00
MOREAU FRANCK
04026dd0b0
fix Stickler CI review
2021-09-08 19:51:34 +02:00
Laurent Destailleur
57a2ea3a53
Fix sql error
2021-09-08 19:49:24 +02:00
Laurent Destailleur
405beb77f5
Fix sql error
2021-09-08 19:45:55 +02:00
MOREAU FRANCK
e9505c1109
Update V14
2021-09-08 18:23:44 +02:00
lmarcouiller
a5e670291e
Fix permission for salaries module
2021-09-08 15:36:51 +02:00
Laurent Destailleur
0b68da4e9e
Debug organizedeventregistration module
2021-09-08 02:27:52 +02:00
Laurent Destailleur
b92784c04b
Fix autoselect of thirdparty
2021-09-07 23:38:33 +02:00
Laurent Destailleur
3cc888f4df
Debug event module
2021-09-07 23:19:36 +02:00
Laurent Destailleur
3df005778c
Debug event module
2021-09-07 19:48:32 +02:00
Laurent Destailleur
32a09e9494
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/salaries/paiement_salary.php
2021-09-07 17:47:00 +02:00
Laurent Destailleur
4e0ae972f1
Fix css
2021-09-07 17:26:31 +02:00
Gauthier PC portable 024
938092d67c
NEW : when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted
2021-09-07 16:46:48 +02:00
ksar
e26e6288c2
FIX #18591 : Remove double quotes of SQL Queries
...
FIX #18591 : Remove double quotes of SQL Queries for postgresql compatibility
2021-09-07 15:22:02 +02:00
Adrien Raze
5f58eefc79
Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into FIX_add_token
2021-09-07 14:48:23 +02:00
Adrien Raze
948d2bc4e9
FIX : Add token when remove the last widget on home page
2021-09-07 14:43:37 +02:00
Laurent Destailleur
586e5c8b5b
Can set sort order in the ->fields description array for foreign key
2021-09-07 14:10:26 +02:00
Laurent Destailleur
51a751f088
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT
2021-09-06 19:00:01 +02:00
Regis Houssin
7d8023fea7
FIX wrong table_element_line
2021-09-06 16:21:30 +02:00
Gauthier PC portable 024
d121544810
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-09-06 16:08:39 +02:00
fr69400
5c9100986d
Update row.php
...
right write doesn't exist for supplier_proposal
->line order dont works
2021-09-06 15:19:35 +02:00
stickler-ci
1043bc964d
Fixing style errors.
2021-09-06 12:58:06 +00:00
Gauthier PC portable 024
be1c08ddfe
FIX : salary extrafields don't work and table is not well named
2021-09-06 12:30:39 +02:00
jpb
06b9f90383
merge conflict
2021-09-06 09:52:28 +02:00
jpb
65a2486f94
merge conflict
2021-09-06 09:43:52 +02:00
Laurent Destailleur
2d6b9a2a0a
CSS
2021-09-06 03:26:27 +02:00
Laurent Destailleur
8e90a374e0
Responsive
2021-09-06 01:47:18 +02:00
Laurent Destailleur
f288f36b71
NEW Can use textarea field into confirm popup.
...
Reponsive
2021-09-06 01:42:54 +02:00
Laurent Destailleur
ed3919da13
Look and feel
2021-09-05 02:25:32 +02:00
Laurent Destailleur
2928c3dc9b
NEW Add a PDF document template for Manufacturing Orders
2021-09-05 02:18:53 +02:00
Laurent Destailleur
d0bbd33bb2
Merge pull request #18602 from mschamp/develop
...
Manufacturing order pdf template
2021-09-05 02:03:09 +02:00
Laurent Destailleur
138af805b3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-04 14:11:38 +02:00
Laurent Destailleur
4e7549ab7d
css
2021-09-04 13:53:31 +02:00
stickler-ci
35f3742d08
Fixing style errors.
2021-09-04 11:05:50 +00:00
mschamp
db6a2844ad
Add files via upload
2021-09-04 12:36:54 +02:00
Laurent Destailleur
ee066ad725
Cast sql var
2021-09-03 21:25:43 +02:00
Laurent Destailleur
a7d9889c40
Merge pull request #18592 from fr69400/develop
...
FIX : delete image from card.php page dont remove the thumbs
2021-09-03 15:12:04 +02:00
fr69400
a89a6b6343
bug image delete
...
Remove linked image from card.php (section builddoc) dont remove the thumbs of image file
2021-09-03 14:18:44 +02:00
Laurent Destailleur
e965d6d6f2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf.php
htdocs/api/class/api_access.class.php
2021-09-03 11:02:21 +02:00
Laurent Destailleur
dc81f1de68
Fix var_dump
2021-09-03 11:00:14 +02:00
Laurent Destailleur
35e5480f2f
Fix var init
2021-09-03 10:58:43 +02:00
Laurent Destailleur
77e9f15360
Work on #18448
2021-09-02 22:52:17 +02:00
Laurent Destailleur
dd6647e6cb
Fix label import fields
2021-09-02 21:03:49 +02:00
Laurent Destailleur
8ea1a9602b
NEW Add import / export of MO and BOMLines - Close #18499
2021-09-02 21:00:31 +02:00
Laurent Destailleur
67db0f1bdb
Add link "Now" on date selection when cloning social contribution
2021-09-02 19:15:21 +02:00
Laurent Destailleur
51b1cd583b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-09-02 18:48:20 +02:00
Laurent Destailleur
7017a98071
Merge pull request #18446 from henrynopo/patch-6
...
Added function - using list of location_incoterms
2021-09-02 18:47:15 +02:00
Laurent Destailleur
147583d58b
Remove useless parameters
2021-09-02 17:25:11 +02:00
Laurent Destailleur
fd2bfc82f2
Fix #18581 Fix #18582
2021-09-02 17:20:14 +02:00
Laurent Destailleur
b04ea59a51
More sql sanitizing
2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f
Fix sql request when using encrypt
2021-09-02 13:45:44 +02:00
Laurent Destailleur
e22bd5c048
Fix better format address for jp in romaji
2021-09-02 10:39:56 +02:00
Laurent Destailleur
8600d8d00d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-09-01 22:50:06 +02:00
Laurent Destailleur
076bfd82a3
FIX option "Default value for field 'Refuse bulk emailings'"
2021-09-01 22:38:47 +02:00
Laurent Destailleur
c762840dec
FIX option "Default value for field 'Refuse bulk emailings'"
2021-09-01 22:37:15 +02:00
Laurent Destailleur
7c7e89cc3b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 18:41:44 +02:00
Laurent Destailleur
4810db3dbf
Merge pull request #18498 from GurvanKervern/undefVars2
...
Undef vars2
2021-09-01 18:36:26 +02:00
Laurent Destailleur
c4acfe5fc0
Merge pull request #18577 from Givriz/dev_2
...
Compatibility phpv8
2021-09-01 18:06:06 +02:00
Laurent Destailleur
82d878dd7a
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-09-01 17:59:07 +02:00
Laurent Destailleur
79a25248cd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 17:55:32 +02:00
Laurent Destailleur
74f3b98ea9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-09-01 17:54:21 +02:00
Laurent Destailleur
38c0e93285
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/public/project/index.php
2021-09-01 17:52:04 +02:00
stickler-ci
1457afb9b9
Fixing style errors.
2021-09-01 15:35:23 +00:00
Laurent Destailleur
60e4e23870
Update object_discounts.tpl.php
2021-09-01 17:33:18 +02:00
Laurent Destailleur
65c92f176c
Merge pull request #18553 from Hystepik/develop#1
...
Fix : KnowledgeManagement menu permission
2021-09-01 16:43:01 +02:00
Givriz
688d217bed
Compatibility phpv8
2021-09-01 16:39:28 +02:00
Laurent Destailleur
ef2bb99476
Update commonobject.class.php
2021-09-01 16:29:08 +02:00
Laurent Destailleur
b66bd781a4
Clean code
2021-09-01 16:26:59 +02:00
Laurent Destailleur
1027f1059e
Merge pull request #18574 from FHenry/14_eventorg
...
fix: disabled module Event Org when project disabled
2021-09-01 16:17:55 +02:00
Laurent Destailleur
14ca7db5d7
Typo in log
2021-09-01 16:17:31 +02:00
Vincent Dieltiens
59e917cd5f
regroup BILL_SUPPLIER_VALIDATE actions
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
2021-09-01 16:14:44 +02:00
Vincent Dieltiens
65ccbb6249
Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition
2021-09-01 16:06:36 +02:00
Laurent Destailleur
46a38506a5
Merge pull request #18562 from vincentjdc/bill-supplier-validate
...
Bill supplier validate
2021-09-01 16:04:50 +02:00
Florian HENRY
bb6dda087c
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_eventorg
2021-09-01 15:23:04 +02:00
Florian HENRY
bae73b9a52
disabled module on inactive
2021-09-01 15:16:11 +02:00
Laurent Destailleur
375557e092
FIX Menu List of project was not visible.
2021-09-01 15:10:02 +02:00
Alexandre SPANGARO
dbe6861f79
Merge remote-tracking branch 'upstream/develop' into 15a8
2021-09-01 14:09:02 +02:00
Laurent Destailleur
9da82af74f
Merge pull request #18566 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2021-09-01 13:36:20 +02:00
Laurent Destailleur
19f0db23df
Fix scrutinizer bugs
2021-08-31 20:31:05 +02:00
Scrutinizer Auto-Fixer
312ca95feb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-08-31 18:18:28 +00:00
Laurent Destailleur
d2d7b0defd
Fix duplicate ;
2021-08-31 20:15:41 +02:00
Maxime Kohlhaas
d09d036f06
Fix supplier invoice pdf generation canelle
...
Thirdparty wrongly fetched was causing errors on mass generation
2021-08-31 16:10:55 +02:00
Laurent Destailleur
c7444865a1
Fix css
2021-08-31 13:16:37 +02:00
Laurent Destailleur
0aa4868c34
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-31 13:14:01 +02:00
Vincent Dieltiens
a3f4ba11aa
regroup BILL_SUPPLIER_VALIDATE actions
2021-08-31 12:47:32 +02:00
Vincent Dieltiens
19587fb88b
Regroup BILL_SUPPLIER_VALIDATE triggers under the same condition
2021-08-31 12:45:03 +02:00
Laurent Destailleur
cceba665a2
NEW Option "Add a link on the PDF to make the online payment"
2021-08-31 12:29:14 +02:00
Laurent Destailleur
b29fc5552d
Fix id in link
2021-08-30 22:10:26 +02:00
Laurent Destailleur
60832c6e87
css
2021-08-30 21:48:46 +02:00
Laurent Destailleur
8639956b79
Fix position of information on lines of documents
2021-08-30 21:22:00 +02:00
Laurent Destailleur
b78771f8c4
Fix select empty value for thirdparties select combo
2021-08-30 18:56:52 +02:00
Adrien Raze
709a297563
NEW : Allow drag and drop on kits
2021-08-30 14:45:42 +02:00
lmarcouiller
31abb98a91
Fix : KnowledgeManagement menu permission
2021-08-30 14:38:36 +02:00
Laurent Destailleur
fbdee1316a
Code comment
2021-08-29 19:36:11 +02:00
Gurvan Kervern
66d1e5c74d
Update eldy.lib.php
2021-08-29 18:15:09 +08:00
Laurent Destailleur
3336b5c405
Fixed implementation for #18373
2021-08-28 21:19:04 +02:00
Laurent Destailleur
c188ef0438
Fixed implementation for #18373
2021-08-28 21:09:52 +02:00
Laurent Destailleur
20e681d025
Revert "[NEW] PDF Document ref in title option"
2021-08-28 20:59:12 +02:00
Laurent Destailleur
f2f3c5daf5
Merge pull request #18373 from bb2a/PDF_Ref_In_Title
...
[NEW] PDF Document ref in title option
2021-08-28 20:41:55 +02:00
Laurent Destailleur
e2eaa9b46e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:54:48 +02:00
Gurvan Kervern
5fd0e6ac28
Update eldy.lib.php
2021-08-29 00:50:00 +08:00
Laurent Destailleur
de44dcb691
Fix var init
2021-08-28 18:48:24 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
...
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
8b996627eb
Merge pull request #18462 from grandoc/new_branch_22_08_2021
...
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\ht…
2021-08-28 18:35:40 +02:00
Laurent Destailleur
c1d3ddf10b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 18:31:06 +02:00
Laurent Destailleur
881d176996
css
2021-08-28 17:30:53 +02:00
Laurent Destailleur
bb94ea7334
Fix debug car reception: Fill/reset link, colspan, translation
2021-08-28 17:24:05 +02:00
Laurent Destailleur
0e38e1e2c4
NEW Add hook hookGetEntity.
...
Change name and param of hook
2021-08-28 14:51:49 +02:00
Laurent Destailleur
9bed2557f5
Merge pull request #18514 from cfoellmann/PR/hook-functionGetEntity
...
add hook 'functionGetEntity'
2021-08-28 14:46:32 +02:00
stickler-ci
3598e0a246
Fixing style errors.
2021-08-28 07:32:07 +00:00
henrynopo
4ae29c53aa
Update pdf_espadon.modules.php
2021-08-28 15:30:05 +08:00
Laurent Destailleur
c02fb6b9a8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-28 03:15:47 +02:00
Laurent Destailleur
acf0386a9b
Fix css
2021-08-28 03:14:48 +02:00
Laurent Destailleur
29abbbe2fb
Clean code
2021-08-28 01:45:53 +02:00
Laurent Destailleur
51a4d7630f
Clean code
2021-08-28 00:56:37 +02:00
Laurent Destailleur
11096a5453
Add hook checkSecureAccess.
...
It replaces mymodule_SUBPERMCATEGORY_FOR_DOCUMENTS and
mymodule_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS
2021-08-28 00:54:57 +02:00
Laurent Destailleur
2dd91bf312
Clean code
2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6
Clean code
2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6
Clean code by adding cast int.
2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5
Clean code by adding cast int.
2021-08-27 16:33:03 +02:00
Christian Foellmann
ac7f0f8a4e
add hook 'functionGetEntity' to manipulate entities for queries on the fly
2021-08-26 15:04:59 +02:00
Laurent Destailleur
931f712c5f
Fix import gender man/woman, not 0/1 + import of thirdparty for members
2021-08-26 11:55:22 +02:00
Laurent Destailleur
ac2fc9c57f
Fix import gender man/woman, not 0/1 + import of thirdparty for members
2021-08-26 11:53:57 +02:00
Laurent Destailleur
65629711d0
FIX #18484
2021-08-25 14:53:14 +02:00
stickler-ci
9512861913
Fixing style errors.
2021-08-25 11:43:32 +00:00
henrynopo
236554948c
Add files via upload
2021-08-25 19:40:58 +08:00
GurvanKervern
7161b1ba59
Fix undef vars 6
...
To remove PHP8 warnings
2021-08-25 18:45:40 +08:00
GurvanKervern
8c99291638
Fix undef vars 5
...
To remove PHP8 warnings
2021-08-25 18:28:32 +08:00
Laurent Destailleur
e4cbc2140e
Fix doc and token renewal with NOSESSION
2021-08-24 21:48:38 +02:00
Christian Foellmann
f094b4c70c
fix up most of the remaining submit inputs
2021-08-24 17:04:17 +02:00
Laurent Destailleur
07ab352877
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2021-08-24 16:37:18 +02:00
Laurent Destailleur
e0fd8b5eb8
Simplify code
2021-08-24 15:28:59 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
...
improve forms - buttonsSaveCreate()
2021-08-24 15:26:03 +02:00
Laurent Destailleur
15da97f1da
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/compta/facture/card.php
htdocs/product/price.php
2021-08-24 15:05:14 +02:00
Laurent Destailleur
591059847e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/product/price.php
2021-08-24 15:00:35 +02:00
Laurent Destailleur
f93e899c0f
Merge pull request #18472 from FHenry/dev_php8
...
fix: php 8 warning
2021-08-24 14:18:29 +02:00
Laurent Destailleur
366fa13fc0
NEW Add property "copytoclipboard" in modulebuilder
2021-08-24 13:19:53 +02:00
Laurent Destailleur
a6ddc90d5b
Fix responsive
2021-08-23 23:53:58 +02:00
Laurent Destailleur
dc006b0ebb
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
8485fee5f9
Cast numeric into on sql request
2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637
Cast numeric into on sql request
2021-08-23 18:56:46 +02:00
Florian HENRY
4dc542acad
fix: php 8 warning
2021-08-23 18:29:04 +02:00
Laurent Destailleur
d4b5ee6c85
Fix cast into variable into sql request.
2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-23 16:04:16 +02:00
Laurent Destailleur
d46dfd017a
FIX #yogosha6944 Protection against traversal path.
2021-08-23 16:00:03 +02:00
Laurent Destailleur
a25346e302
FIX Date of payment of subscription must not be set to 1970-01-01.
...
Fix look and feel v14
2021-08-23 15:00:29 +02:00
Laurent Destailleur
983d7e5177
FIX Add option $noescapecommand in executeCLI for better compatibility
2021-08-23 12:26:16 +02:00
Laurent Destailleur
041784876d
Fix option $nolog
2021-08-23 12:25:59 +02:00
Laurent Destailleur
227f01b000
Fix can add a redirection into the executeCLI method.
2021-08-23 12:25:48 +02:00
Laurent Destailleur
fdffc0c13a
NEW Add param $nolog to avoid logging into dol_delete_recursive_dir()
2021-08-23 12:25:29 +02:00
Laurent Destailleur
b0817e132f
FIX Add option $noescapecommand in executeCLI for better compatibility
2021-08-23 12:19:16 +02:00
Laurent Destailleur
8c017b9406
Sanitize $ and ; for filesystem path (like files).
2021-08-23 12:18:04 +02:00
Laurent Destailleur
cced15e50a
Fix option $nolog
2021-08-23 11:58:14 +02:00
Laurent Destailleur
eec5fba333
Fix can add a redirection into the executeCLI method.
2021-08-23 11:51:08 +02:00
Laurent Destailleur
34c1991730
NEW Add param $nolog to avoid logging into dol_delete_recursive_dir()
2021-08-23 11:32:25 +02:00
Philippe GRAND
7c2d19ffaf
FIX : indentation
2021-08-23 10:20:22 +02:00
Philippe GRAND
f88fdbe71d
FIX : for php8 compliance
2021-08-23 10:12:28 +02:00
Philippe GRAND
7baf98dbfa
fix : Undefined property: Conf:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\html.form.class.php on line 7957
2021-08-22 23:15:36 +02:00
Philippe GRAND
538b2e2a5f
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\class\commonobject.class.php on line 1705
2021-08-22 19:47:06 +02:00
Philippe GRAND
2e3b9fce49
fix : Undefined array key 4 in C:\wamp64\www\dolibarr-140\htdocs\core\class\extrafields.class.php on line 1721
2021-08-22 12:18:26 +02:00
Philippe GRAND
6619099be9
fix : Undefined property: stdClass:: in C:\wamp64\www\dolibarr-140\htdocs\core\actions_builddoc.inc.php on line 69
2021-08-22 12:05:30 +02:00
Alexandre SPANGARO
a1d3e21e77
NEW IHM - Include new options to manage dashboard
2021-08-22 05:25:13 +02:00
Laurent Destailleur
ff3f85b214
Fix case sensitive
2021-08-22 01:44:52 +02:00
Laurent Destailleur
58fa0740c3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/errors.lang
2021-08-22 01:41:18 +02:00
Christian Foellmann
3f895f7dc5
correct codestyle
2021-08-21 19:57:52 +02:00
Christian Foellmann
7ca490088a
fix codestyle issues
2021-08-21 19:51:31 +02:00
Florian HENRY
1cc04c54ca
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_project_upgrade_external_user_perms_project
2021-08-21 15:29:32 +02:00
Laurent Destailleur
04a922b5f4
Implement the noescapetags into dol_escape_htmltag
2021-08-21 13:27:33 +02:00
Laurent Destailleur
68d24661db
Try to fix the ' that show ' on PDF
2021-08-21 12:19:50 +02:00
Christian Foellmann
d706c3b1ec
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
2021-08-20 14:41:30 +02:00
jpb
a3bae451d5
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:43 +02:00
jpb
ed65bca666
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-20 14:06:13 +02:00
jpb
d9a07acfa3
remove duplicate code
2021-08-20 14:05:22 +02:00
henrynopo
0933b6c39f
Update html.form.class.php
2021-08-20 20:04:53 +08:00
Laurent Destailleur
335e1ff405
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-20 12:45:37 +02:00
Laurent Destailleur
10ddd621ca
Fix escape error message
2021-08-20 12:40:49 +02:00
henrynopo
b2252106c3
Added function - using list of location_incoterms
...
Added function to call for list of location_incoterms from the existing order records or table of location_incoterms.
Accordingly, an dditional ajex file namely "locationincoterms.php" and a database table namely c_location_incoterms are required.
2021-08-20 10:43:34 +08:00
stickler-ci
c750c5f7cf
Fixing style errors.
2021-08-19 14:45:55 +00:00
Anthony Berton
58b50d02c7
default ref in title 2
2021-08-19 16:43:35 +02:00
Anthony Berton
10c445cf6a
default ref in title
2021-08-19 16:13:41 +02:00
Laurent Destailleur
eb70cb2ecc
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-19 02:49:24 +02:00
Laurent Destailleur
399a44ea20
Update objectline_create.tpl.php
2021-08-18 21:40:49 +02:00
Laurent Destailleur
cec94b5f33
Merge pull request #18433 from aspangaro/15a2
...
NEW Ihm admin - Add tabs
2021-08-18 21:30:41 +02:00
Laurent Destailleur
c2bfc87c34
Merge pull request #18435 from henrynopo/patch-2
...
Added China into the list of country using State / province in address
2021-08-18 21:28:16 +02:00
Laurent Destailleur
13e64d2f79
Fix replace file_get_contents with getURLContent
2021-08-18 19:46:37 +02:00
Gauthier PC portable 024
9098356b1f
FIX : travis feedbacks
2021-08-18 19:44:40 +02:00
Laurent Destailleur
ee6a2f73db
css install
2021-08-18 19:32:07 +02:00
Gauthier PC portable 024
c56c74bbdd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-08-18 18:31:11 +02:00
henrynopo
526ea1a9b3
Added China into the list of country using State / province in address
2021-08-18 22:30:28 +08:00
jpb
fcd485f614
merge conflict
2021-08-18 09:16:28 +02:00
Anthony Berton
fcdb4bfafb
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-18 08:43:20 +02:00
Laurent Destailleur
82db3ae1a9
NEW Use lang selector when using a field key 'lang' in modulebuilder
2021-08-18 01:54:13 +02:00
Laurent Destailleur
3bc8a7345c
Merge branch 'develop' into develop#1
2021-08-18 00:37:23 +02:00
Laurent Destailleur
da3fb82868
Merge pull request #18175 from defrance/patch-170
...
FIX : "disabled" field missing on definition
2021-08-17 23:34:34 +02:00
Laurent Destailleur
bbcea38793
Fix phpcs
2021-08-17 21:58:06 +02:00
Alexandre SPANGARO
a7cb9b2143
NEW Ihm admin - Add tabs
2021-08-17 21:29:15 +02:00
Laurent Destailleur
1ff6c33276
Merge pull request #17537 from kastoras/create_share_on_file_upload_with_other_setup
...
New Add option MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE to share file on any file upload
2021-08-17 20:11:54 +02:00
stickler-ci
5d0318c98f
Fixing style errors.
2021-08-17 18:11:12 +00:00
Laurent Destailleur
659f24efa9
Update files.lib.php
2021-08-17 20:10:47 +02:00
Laurent Destailleur
9521a9e77f
Clean code
2021-08-17 20:02:19 +02:00
Laurent Destailleur
59c9c48844
Merge branch 'develop' into new_validation_method_for_common_object
2021-08-17 19:35:36 +02:00
Laurent Destailleur
84073c6373
Merge branch 'develop' into patch-169
2021-08-17 19:31:30 +02:00
Laurent Destailleur
2a19c02f19
Merge pull request #18178 from defrance/patch-171
...
PHP V8 warning error, use of not declared array
2021-08-17 19:29:49 +02:00
Laurent Destailleur
f0f8210918
Update DolibarrModules.class.php
2021-08-17 19:28:26 +02:00
Laurent Destailleur
5d70ce4f99
Merge pull request #18310 from Hystepik/develop#2
...
Close #18302 : Mass action leave requests aproval
2021-08-17 19:23:30 +02:00
Laurent Destailleur
4f29a01da4
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 19:12:21 +02:00
Laurent Destailleur
95721d36ab
Merge pull request #17687 from FHenry/dev_massaction_paid_custom_invoice
...
NEW : mass action paid customer invoice
2021-08-17 19:10:49 +02:00
Laurent Destailleur
0858487119
Fix #18343
2021-08-17 18:52:33 +02:00
Laurent Destailleur
e8646c7919
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-17 18:30:37 +02:00
Laurent Destailleur
33697cec1c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-17 18:13:18 +02:00
Laurent Destailleur
fb1e5f72d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 18:11:08 +02:00
Laurent Destailleur
8eba57f722
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-17 16:51:01 +02:00
Laurent Destailleur
9c78f8f647
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-17 16:46:06 +02:00
Laurent Destailleur
27a580dc95
Merge branch 'develop' into PDF_show_sender_name
2021-08-17 16:41:19 +02:00
Laurent Destailleur
a0d82e6bf7
Merge pull request #18404 from lainwir3d/add_url_shipment_substitute
...
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the shipment URL
2021-08-17 16:36:09 +02:00
Laurent Destailleur
582bf1415e
Update functions.lib.php
2021-08-17 16:35:43 +02:00
Laurent Destailleur
2035499a34
Merge pull request #18402 from lainwir3d/add_newref_substitute
...
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
2021-08-17 16:34:11 +02:00
Laurent Destailleur
3e5deeadf4
Merge pull request #18406 from vincentjdc/supplier-order-hide-product-label
...
NEW : Adds PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES to hide product label in supplier order lines
2021-08-17 16:24:19 +02:00
Laurent Destailleur
284207aeb3
Merge pull request #18429 from atm-quentin/NEW_hook_after_rank_update
...
NEW hook after rank update
2021-08-17 16:15:44 +02:00
Laurent Destailleur
7986f4881c
Update commonobject.class.php
2021-08-17 16:12:45 +02:00
Laurent Destailleur
1a8ad5abfa
Propagate $outputlangs to getExtrafieldContent method.
2021-08-17 15:50:28 +02:00
Laurent Destailleur
f18f970b08
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-17 13:52:36 +02:00
Laurent Destailleur
7d61609462
FIX #yogosha6907
2021-08-17 13:13:04 +02:00
Quentin VIAL-GOUTEYRON
5f4ab188cf
NEW hook after rank update
2021-08-17 09:33:50 +02:00
Laurent Destailleur
92d6ad9597
Removed old simple POS module ('cashdesk' module)
2021-08-17 04:57:53 +02:00
Laurent Destailleur
a31f991b39
Doc
2021-08-17 04:41:33 +02:00
Laurent Destailleur
7a3649b6e5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-08-17 03:21:13 +02:00
Laurent Destailleur
f51bcf0038
Debug notification module
2021-08-17 03:20:57 +02:00
Laurent Destailleur
06a0d922cc
NEW Can use the result_mode of mysqli driver. Save memory for list count
2021-08-16 22:01:58 +02:00
Alexandre SPANGARO
f88abb9a6f
Add parenthesis
2021-08-15 07:32:46 +02:00
Alexandre SPANGARO
0d467972cd
Merge branch '12.0' into 12p18
2021-08-15 07:19:33 +02:00
lainwir3d
2125bc9aa5
CLOSE #18403 Add __URL_SHIPMENT__ substitute to get the URL of a shipment
2021-08-12 17:15:57 +04:00
lainwir3d
84b8717693
CLOSE #18401 Add __NEWREF__ subtitute to get new object reference.
...
Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
2021-08-12 17:05:00 +04:00
lainwir3d
cd60d09d9e
FIX #18399 Fix shipment validation email template override.
...
Object type name for shipment was apparently wrong.
2021-08-12 16:16:45 +04:00
Vincent Dieltiens
e691217d00
Add a Global variable 'PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES' to have the possibility to hide product label in supplier order lines.
2021-08-12 13:56:41 +02:00
jpb
b1cba14718
merge conflict
2021-08-12 09:36:34 +02:00
Laurent Destailleur
d7317025e9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/pdf_other.php
2021-08-11 22:09:05 +02:00
Laurent Destailleur
ef4468153d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 22:07:13 +02:00
Laurent Destailleur
0cf2164260
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-08-11 21:15:30 +02:00
Laurent Destailleur
dd70d68b4c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-08-11 21:06:42 +02:00
Laurent Destailleur
eba55d0cf2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
2021-08-11 21:06:33 +02:00
Laurent Destailleur
bfedd4a04c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-11 20:47:51 +02:00
Laurent Destailleur
23713d1deb
Merge pull request #18328 from lainwir3d/shipment_close_order_on_close
...
NEW #18326 Workflow: Close order on shipment closing.
2021-08-11 20:47:06 +02:00
Laurent Destailleur
34b53592b8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-08-11 19:44:33 +02:00
Laurent Destailleur
310b5c974b
Fix help
2021-08-11 19:43:12 +02:00
Anthony Berton
d421d3d8e3
Merge branch 'develop' into PDF_Ref_In_Title
2021-08-11 18:39:32 +02:00
Anthony Berton
32e5b531ba
Merge branch 'develop' into PDF_show_sender_name
2021-08-11 18:38:30 +02:00
Anthony Berton
956bd00c13
CHANGE_CONST_ADD_DOC
2021-08-11 18:37:13 +02:00
Anthony Berton
fb42e3f473
add_doc
2021-08-11 18:25:48 +02:00
Anthony Berton
652cd3afa5
Merge branch 'develop' into PDF_Option_show_code_client
2021-08-11 18:17:58 +02:00
Anthony Berton
a8562704cf
add_doc
2021-08-11 18:16:53 +02:00
Anthony Berton
0bab31e973
Merge branch 'develop' into PDF_Propal_frame_option
2021-08-11 18:12:02 +02:00
Anthony Berton
e89c1b49a8
add_espadon_doc
2021-08-11 17:44:40 +02:00
Anthony Berton
c62c53bf5e
add_sponge_doc
2021-08-11 17:42:43 +02:00
Anthony Berton
fc10fd0901
add_cyan_doc
2021-08-11 17:32:09 +02:00
Anthony Berton
8d1a53ce98
add eratosthene doc
2021-08-11 16:28:13 +02:00
Anthony Berton
c5e8302ba2
Const
2021-08-11 16:18:16 +02:00
Laurent Destailleur
1cdab44252
Merge pull request #18363 from fappels/15_update_hook_printOriginObjectLine
...
Remove strange check on hook printOriginObjectLine.
2021-08-11 15:55:55 +02:00
Laurent Destailleur
8da328b183
Update extrafields_list_search_sql.tpl.php
2021-08-11 15:44:48 +02:00
Laurent Destailleur
6fbd93999f
css
2021-08-11 13:33:51 +02:00
stickler-ci
3e2b4b45c1
Fixing style errors.
2021-08-11 11:00:11 +00:00
Anthony Berton
40329b9181
other_doc
2021-08-11 12:59:34 +02:00
Anthony Berton
967d526307
other_frame
2021-08-11 12:41:50 +02:00
Anthony Berton
b8ccbf39f3
other_doc
2021-08-11 12:39:24 +02:00
stickler-ci
b7441aaf45
Fixing style errors.
2021-08-11 10:37:06 +00:00
Anthony Berton
b45a57060f
const_and_other_doc
2021-08-11 12:36:16 +02:00
Anthony Berton
816648f283
other_docs
2021-08-11 12:28:44 +02:00
Laurent Destailleur
f48a9aa3ad
Optimize size of html
2021-08-10 19:44:55 +02:00
Laurent Destailleur
21df418468
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-10 19:28:44 +02:00
Laurent Destailleur
4faf6f5d84
Fix crlf
2021-08-10 19:28:06 +02:00
stickler-ci
1d9d90036d
Fixing style errors.
2021-08-10 15:14:41 +00:00
Laurent Destailleur
bef0989b15
Missing declaration
2021-08-10 13:34:21 +02:00
Anthony Berton
6a41edd3c2
ok
2021-08-10 13:02:37 +02:00
Marc de Lima Lucio
b610cc1c6c
FIX: shipping validation workflow: 'ORDER_CLOSE' trigger called from wrong object
2021-08-10 11:18:25 +02:00
Anthony Berton
366625f300
const
2021-08-10 09:50:14 +02:00
Anthony Berton
f8df845442
Const and Com
2021-08-10 09:45:15 +02:00
Anthony Berton
3b04c28c4f
const
2021-08-10 09:41:40 +02:00
Anthony Berton
284b40f152
CONST
2021-08-10 09:38:07 +02:00
Anthony Berton
0bead55836
ok
2021-08-09 18:11:36 +02:00
stickler-ci
adc6f883e2
Fixing style errors.
2021-08-09 16:03:13 +00:00
Anthony Berton
6b3b6fd508
ok
2021-08-09 18:01:43 +02:00
stickler-ci
190ae8377e
Fixing style errors.
2021-08-09 15:42:38 +00:00
Anthony Berton
41457d2adb
ok
2021-08-09 17:16:48 +02:00
Laurent Destailleur
591b4c6793
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-09 16:49:16 +02:00
Quentin VIAL-GOUTEYRON
108a5ff7cb
FIX postgre filter select search extrafield
2021-08-09 15:14:25 +02:00
Francis Appels
91ef2a44fd
Remove strange check on hook printOriginObjectLine.
...
Now need reshook.
2021-08-09 11:17:11 +02:00
Laurent Destailleur
029da815b2
Code comment
2021-08-08 12:35:52 +02:00
Laurent Destailleur
47d57b1ed2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:23:44 +02:00
Laurent Destailleur
78e993c9f3
Fix permission to read reports
2021-08-08 12:23:14 +02:00
Laurent Destailleur
7247b99170
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-08 12:15:25 +02:00
Laurent Destailleur
28ff7c894b
Fix missing permission
2021-08-08 12:14:40 +02:00
Laurent Destailleur
fec5a22c65
Fix filter to find files of a ref.
2021-08-06 13:26:01 +02:00
Laurent Destailleur
4c3c613568
Fix filter to find files of a ref.
2021-08-06 13:24:40 +02:00
Laurent Destailleur
c0c46fb704
FIX Link of download main doc on vat list
2021-08-06 12:20:12 +02:00
Laurent Destailleur
6cefd0a756
FIX Link of download main doc on vat list
2021-08-06 12:18:51 +02:00
Laurent Destailleur
047bbbb298
NEW Can set/unset the usual working day of the week
2021-08-05 14:42:28 +02:00
jpb
04d406bd39
remove useless boolean statment
2021-08-05 09:09:11 +02:00
Laurent Destailleur
76038e692d
NEW Use an ajax call for the clicktodial feature instead of href link.
2021-08-04 20:07:12 +02:00
jpb
f99ba2c1e1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_field_in_service_object
2021-08-04 17:26:23 +02:00
Hystepik
e02d93c401
Merge branch 'develop' into develop#1
2021-08-04 16:15:50 +02:00
Laurent Destailleur
ce0d9f3b17
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-04 12:38:56 +02:00
Laurent Destailleur
aaefb7b324
Fix css
2021-08-04 12:38:28 +02:00
lmarcouiller
8cbbcc01a9
Update to make lan field common
2021-08-04 11:25:23 +02:00
Laurent Destailleur
6c19524fd7
code comment
2021-08-04 00:12:49 +02:00
Laurent Destailleur
5becf13f2b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-03 17:09:09 +02:00
Laurent Destailleur
ede571dcfe
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-08-03 17:08:49 +02:00
Laurent Destailleur
d3fa85cdb4
Merge pull request #18324 from Hystepik/develop#4
...
Close #18043 : fk_user_assign in create ticket
2021-08-03 17:06:55 +02:00
Laurent Destailleur
1c981ccb9d
Fix look and feel v14
2021-08-03 17:03:34 +02:00
Gauthier PC portable 024
6e7fa5ffeb
FIX : stickler feddbacks
2021-08-03 16:53:44 +02:00
stickler-ci
2577936670
Fixing style errors.
2021-08-03 14:39:28 +00:00
stickler-ci
1da9829d61
Fixing style errors.
2021-08-03 14:08:23 +00:00
Gauthier PC portable 024
1d2527b991
FIX : weight and units display
2021-08-03 16:00:32 +02:00
lainwir3d
4873a91afc
CLOSE #18326 Workflow: Close order on shipment closing.
...
Allow an order to be closed automatically when all linked shipment have been closed and all products / items have been shipped.
2021-08-03 17:55:28 +04:00
Laurent Destailleur
ce38ccc121
Merge pull request #18184 from ksar-ksar/patch-5
...
FIX #18181
2021-08-03 15:35:20 +02:00
Laurent Destailleur
070fc26dcb
Merge pull request #18309 from grandoc/new_branch_02_08_2021
...
New branch 02 08 2021
2021-08-03 15:31:25 +02:00
lmarcouiller
c8fd7ccbb6
Close #18043 : fk_user_assign in create ticket
2021-08-03 15:06:53 +02:00
Laurent Destailleur
d0c57dac34
FIx #18217 - Salary - link 'salary' of bank_url not managed
2021-08-03 15:02:09 +02:00
stickler-ci
9d2552e77b
Fixing style errors.
2021-08-03 09:29:25 +00:00
Quentin VIAL-GOUTEYRON
2fab637b92
add dol_concatdesc
2021-08-03 11:26:57 +02:00
Quentin VIAL-GOUTEYRON
f22a02a7ef
fix br
2021-08-03 11:21:47 +02:00
Gauthier PC portable 024
335dca7fc3
FIX : No paiement information for pdf eagle proforma
2021-08-03 09:41:10 +02:00
Laurent Destailleur
0058e32207
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-08-02 19:03:38 +02:00
Laurent Destailleur
eced1c824a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/class/html.form.class.php
htdocs/projet/tasks/time.php
2021-08-02 18:47:09 +02:00
Laurent Destailleur
d822421e10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/accountancy/tpl/export_journal.tpl.php
htdocs/projet/tasks/time.php
2021-08-02 18:31:26 +02:00
stickler-ci
042e2f9893
Fixing style errors.
2021-08-02 15:31:24 +00:00
Gauthier PC portable 024
b83b77beb5
NEW : stock transfer sheet proforma + default model system like cmd invoice, etc...
2021-08-02 17:28:41 +02:00
lmarcouiller
1cef6d31e8
Close #18302 : Mass action leave requests
2021-08-02 15:45:55 +02:00
Philippe GRAND
3c05cd0757
fix typo and translation
2021-08-02 12:41:55 +02:00
Philippe GRAND
703217acd0
backward
2021-08-02 12:39:45 +02:00
Philippe GRAND
3acb304dd3
fix typo and translation
2021-08-02 12:35:46 +02:00
Gauthier PC portable 024
a45bab10bd
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_stockstransfers
2021-08-02 10:09:18 +02:00
Laurent Destailleur
d8a9a0cfb8
Merge pull request #18188 from frederic34/patch-11
...
fix php8 warnings
2021-08-01 23:42:17 +02:00
Laurent Destailleur
3ca1e1c4c0
Merge pull request #18196 from FHenry/develop_addexport
...
new: add column into export invoice
2021-08-01 23:32:51 +02:00
Laurent Destailleur
957b373ecd
Merge pull request #18200 from frederic34/notify
...
notify class indent
2021-08-01 23:27:49 +02:00
Laurent Destailleur
b67487b2ca
Fix reposition
2021-07-31 17:28:43 +02:00
Laurent Destailleur
7eb8232b75
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-31 17:21:05 +02:00
Laurent Destailleur
bd35d86268
Debug v14
2021-07-31 17:20:48 +02:00
Laurent Destailleur
b332d02d20
Merge pull request #18248 from cfoellmann/agenda-fcomm-cancel
...
NEW add agenda auto creation on supplier_order cancellation
2021-07-31 17:02:08 +02:00
Laurent Destailleur
cb2c7d1485
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 17:00:00 +02:00
Laurent Destailleur
85a02c5615
Merge pull request #18288 from FHenry/14_deveventorg
...
NEW: EventOrganization Module #FoundationFunding
2021-07-31 16:57:07 +02:00
Laurent Destailleur
530a773eaa
Merge pull request #18300 from cfoellmann/fix-tomail-field
...
fix `tomail` param in mail form usage
2021-07-31 16:55:01 +02:00
Laurent Destailleur
af95169d1d
Update actions_sendmails.inc.php
2021-07-31 16:54:18 +02:00
Laurent Destailleur
6f449cfd6c
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-31 16:33:38 +02:00
Laurent Destailleur
0c024ca96b
Merge pull request #18297 from cfoellmann/hook-menu
...
NEW add hook 'menuLeftMenuItems' to filter the leftmenu items
2021-07-31 16:13:49 +02:00
Laurent Destailleur
9f293066ab
Merge pull request #18206 from Hystepik/develop#2
...
New : Inventory scanner tool implemented
2021-07-31 13:27:18 +02:00
Laurent Destailleur
58fa6ac4ab
Merge pull request #18215 from netdrag/order_supplier_email_sender-patch-1
...
Order Supplier Email Sender Extension
2021-07-31 12:29:49 +02:00
Laurent Destailleur
04911bde25
Merge pull request #18277 from atm-florianm/FIX_forum_post_37369_wrong_conf_used
...
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-31 12:20:18 +02:00
Laurent Destailleur
9dc61adcc7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-30 18:44:15 +02:00
Laurent Destailleur
9c626bede4
Fix dol_hash for sha256
2021-07-30 18:43:35 +02:00
Gauthier PC portable 024
142f93e50c
FIX : functions visibility
2021-07-30 15:35:31 +02:00
Christian Foellmann
f830a0f5e2
fix tomail param in mail form usage
2021-07-30 15:20:41 +02:00
Laurent Destailleur
5995e01bd1
Merge pull request #18280 from ptibogxiv/patch-439
...
Fix for php 8
2021-07-30 15:19:54 +02:00
Christian Foellmann
055a5c4ab6
fix hook name
2021-07-30 15:19:05 +02:00
Gauthier PC portable 024
846f0366d3
FIX : travis feedbacks
2021-07-30 14:17:36 +02:00
stickler-ci
3ceb451734
Fixing style errors.
2021-07-30 11:19:18 +00:00
Christian Foellmann
0102e73306
add hook 'menu_LeftMenuArray' to filter the leftmenu items
2021-07-30 13:15:01 +02:00
jpb
15578c2ec2
merge conflict
2021-07-30 10:57:04 +02:00
Florian HENRY
510cf36bbd
Merge branch '14.0' of github.com:Dolibarr/dolibarr into 14_deveventorg
2021-07-30 09:26:55 +02:00
Laurent Destailleur
047c575d61
Fix some errors on ticket module
2021-07-30 01:42:52 +02:00
Laurent Destailleur
0c3bf536f2
Fix field resolution
2021-07-30 01:10:15 +02:00
Florian HENRY
6f3080c67c
send mail from ConfOrBooth list to attendees or santd company
2021-07-29 19:24:12 +02:00
Florian HENRY
ae5bb956ac
fix invoice in stand registration pb
2021-07-29 17:18:05 +02:00
stickler-ci
9805281733
Fixing style errors.
2021-07-29 14:20:50 +00:00
Gauthier PC portable 024
3f42689633
FIX : name
2021-07-29 16:17:12 +02:00
Gauthier PC portable 024
6d460d78ca
NEW : Stocks transfers objects management
2021-07-29 16:09:07 +02:00
Alexandre SPANGARO
ca6dd8850a
FIX: Manage credit note on situation invoice for calculate margin
2021-07-29 15:24:08 +02:00
ptibogxiv
da482018d2
Fix for php 8
2021-07-29 10:51:51 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel
2021-07-29 08:14:02 +02:00
atm-florian
fdd0ab8461
FIX $conf->task used but it does not exist, use $conf->projet instead
2021-07-28 23:56:44 +02:00
Josep Lluís
e7af8e9d5e
FIX totalDayAll hours in tasks
...
The extra days hours were not considered in total hours
2021-07-28 19:40:33 +02:00
Frédéric FRANCE
ae5d17815f
Update dolreceiptprinter.class.php
2021-07-28 19:39:17 +02:00
Laurent Destailleur
9b73fac947
Merge pull request #18245 from frederic34/patch-12
...
Update dolreceiptprinter.class.php
2021-07-28 19:38:29 +02:00
Laurent Destailleur
d2311bcdeb
Merge pull request #18234 from ptibogxiv/patch-432
...
fix for php 8
2021-07-28 19:36:13 +02:00
Laurent Destailleur
07c4c36520
Merge pull request #18271 from Hystepik/develop_v14#2
...
Fix a bug in ecm for v14
2021-07-28 19:16:33 +02:00
ptibogxiv
99e256a417
Update functions.lib.php
2021-07-28 18:22:26 +02:00
Josep Lluís
20add7d3fc
FIX totalDayAll hours in tasks
...
The extra days hours were not considered in total hours
2021-07-28 18:02:55 +02:00
Laurent Destailleur
2b2c8f076b
Merge pull request #18231 from ptibogxiv/patch-429
...
Fix for php 8
2021-07-28 17:37:07 +02:00
Laurent Destailleur
fe2d229ba9
Merge pull request #18235 from ptibogxiv/patch-433
...
Fix for php8
2021-07-28 17:35:01 +02:00
Laurent Destailleur
0476b36c6c
Merge pull request #18238 from ptibogxiv/patch-436
...
Fix for php8
2021-07-28 17:29:54 +02:00
Laurent Destailleur
12a0029fb7
Merge pull request #18240 from ptibogxiv/patch-438
...
Fix for php 8
2021-07-28 17:28:49 +02:00
lmarcouiller
df8f099857
Fix a bug in ecm for v14
2021-07-28 15:57:12 +02:00
Laurent Destailleur
9dc45ac6ec
Merge pull request #18251 from cfoellmann/improve-makeorder
...
Improve makeorder
2021-07-28 15:41:09 +02:00
kamel
b4ccb1b355
Corrections stickler-ci
2021-07-28 12:29:17 +02:00
kamel
2cd7513936
NEW: add link to a element by ref
2021-07-28 12:18:35 +02:00
Ferran Marcet
67cc580797
Fix: Bad rights on inventory module
2021-07-28 10:45:47 +02:00
Lenin Rivas
6038ef6bba
Add filter select company
...
Add filter with name alias and tva intra
2021-07-27 12:28:18 -05:00
Christian Foellmann
d9529f2600
save makeorder comment to agenda item
2021-07-27 16:37:34 +02:00
Christian Foellmann
faf50a5aaa
add agenda auto creation on supplier_order cancellation
2021-07-27 15:06:28 +02:00
Frédéric FRANCE
bc8be62809
Update dolreceiptprinter.class.php
2021-07-27 10:26:51 +02:00
ptibogxiv
54c151916d
Fix for php 8
2021-07-26 15:42:43 +02:00
ptibogxiv
3cb56d3ec6
Fix for php8
2021-07-26 15:35:31 +02:00
ptibogxiv
36ba5c6a71
Fix for php8
2021-07-26 15:22:50 +02:00
ptibogxiv
dc30052d3e
fix for php 8
2021-07-26 15:07:52 +02:00
ptibogxiv
b0e2ef4a6c
Update extrafields_edit.tpl.php
2021-07-26 14:53:18 +02:00
ptibogxiv
026e61f1ec
Update extrafields_edit.tpl.php
2021-07-26 14:53:06 +02:00
ptibogxiv
d443485939
Update extrafields_edit.tpl.php
2021-07-26 14:52:24 +02:00
Laurent Destailleur
079b014b14
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-26 00:41:35 +02:00
Laurent Destailleur
505543e18e
Fix #yogosha6704
2021-07-26 00:37:47 +02:00
stickler-ci
5524320fbc
Fixing style errors.
2021-07-23 17:46:44 +00:00
Florian HENRY
e93a362a0d
fix: since be62c2f7 commit selectlist from formconfirm were behind the form confirm
2021-07-23 18:33:18 +02:00
Laurent Destailleur
4c505619e3
FIX look and field v14
2021-07-23 00:02:14 +02:00
netdrag
6cfd8c6f24
Order Supplier Email Sender Extension
...
Extended the advanced options to specify an email address for the order supplier. Useful if you operate under a brand, but order under a different.
2021-07-22 18:38:22 +02:00
Frédéric FRANCE
44fa70c7c7
notify class indent
2021-07-22 09:24:14 +02:00
Frédéric FRANCE
5e6c942caf
notify class indent
2021-07-22 09:22:42 +02:00
Florian HENRY
8eafbf9101
add column into export invoice
2021-07-21 17:00:57 +02:00
stickler-ci
252765303e
Fixing style errors.
2021-07-21 07:48:57 +00:00
jpb
0396573b91
fix focusout on mandatoryPeriod only
2021-07-21 09:46:38 +02:00
jpb
2189af1f2a
Merge branch 'NEW_field_in_service_object' of github.com:atm-jpb/dolibarr into NEW_field_in_service_object
2021-07-21 08:57:09 +02:00
jpb
62d007e232
add focusout constraint
2021-07-21 08:56:40 +02:00
stickler-ci
c93e2cda0d
Fixing style errors.
2021-07-21 06:31:07 +00:00
jpb
32f9b1a556
fix cmd fourn no msg
2021-07-21 08:26:41 +02:00
Laurent Destailleur
062c39c40d
Fix html entities when we should not
2021-07-21 01:40:45 +02:00
jpb
d61b831737
add field in create product
2021-07-20 22:39:30 +02:00
Frédéric FRANCE
828e65c724
Update html.form.class.php
2021-07-20 20:56:01 +02:00
Frédéric FRANCE
71b95f3511
fix php8 warnings
2021-07-20 20:54:27 +02:00
ksar
4d6b63dbed
FIX #18181
...
FIX #18181
2021-07-20 16:14:47 +02:00
stickler-ci
2f0ba41a53
Fixing style errors.
2021-07-20 13:35:10 +00:00
lmarcouiller
dd9eb28230
Barcode scanner tool update
2021-07-20 14:43:36 +02:00
jpb
367e839239
change class css and behavior js
2021-07-20 13:56:30 +02:00
jpb
e11afb7da0
add color on date dield and warning on line
2021-07-20 11:23:35 +02:00
BENKE Charlene
98a2c35ab5
PHP V8 warning error, use of not declared array
2021-07-19 17:51:06 +02:00
BENKE Charlene
acdac32845
FIX : "disabled" field missing on definition
2021-07-19 13:46:50 +02:00
lmarcouiller
b309af0ab8
First push new scan quanty inventory
2021-07-19 13:43:48 +02:00
BENKE Charlene
09954a3047
Update html.formcompany.class.php
2021-07-19 11:01:06 +02:00
Laurent Destailleur
c0d54fe608
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:03:52 +02:00
Laurent Destailleur
0ccc2d9033
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-16 15:01:11 +02:00
Laurent Destailleur
af1c43c70d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/modBarcode.class.php
htdocs/fourn/class/fournisseur.commande.dispatch.class.php
2021-07-16 14:05:42 +02:00
Laurent Destailleur
2fc8a80070
Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron
...
NEW: holiday: handle monthly balance updates with cronjob
2021-07-16 12:48:12 +02:00
Florian HENRY
63a47112ae
new: #18162
2021-07-16 11:14:30 +02:00
Florian HENRY
c928de89c6
fix: print barcode sould not be available for external user
2021-07-16 10:41:06 +02:00
Laurent Destailleur
ce27feda84
Debug v14
...
Fix email collector (Creation of thirparty, set of extrafields)
2021-07-16 00:12:58 +02:00
Laurent Destailleur
9aad07f20c
Remove log
2021-07-15 21:57:32 +02:00
Laurent Destailleur
5da40d80f7
Fix css
2021-07-15 16:35:06 +02:00
Laurent Destailleur
83d931f3c7
FIX #18143
2021-07-14 17:40:36 +02:00
Laurent Destailleur
fb8ecf10d9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-14 14:49:30 +02:00
Laurent Destailleur
638a66fbb9
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/main.lang
2021-07-14 14:49:06 +02:00
Laurent Destailleur
a773652c04
Fix phpcs
2021-07-14 14:37:07 +02:00
Laurent Destailleur
7281a51eff
Merge pull request #18148 from AlexisLaurier/fix/CommonObjectShowInputFieldCheckboxAndRadio
...
fix showInputField checkbox and radio type
2021-07-14 13:55:53 +02:00
Laurent Destailleur
a88ab8e443
Merge pull request #18147 from atm-john/fix_dialog_btn
...
Fix : dialog BTN and add doc
2021-07-14 13:53:41 +02:00
Laurent Destailleur
21f295565a
Merge pull request #18144 from Hystepik/develop#1
...
Fix : remove of a button which was forgotten
2021-07-14 13:50:42 +02:00
Alexis LAURIER
cd5e1d603e
fix showInputField checkbox and radio type
2021-07-14 12:02:03 +02:00
ATM john
87c26ae0e2
Add php doc
2021-07-14 10:07:03 +02:00
Laurent Destailleur
724d00fc6c
Fix phpcs
2021-07-14 02:20:15 +02:00
ATM john
1a330e0b88
Fix dialog BTN and add doc
2021-07-14 00:02:55 +02:00
Gauthier PC portable 024
0fe46b53d8
FIX : method_exists needs object at first param
2021-07-13 15:18:40 +02:00
lmarcouiller
9a12b5e424
Fix : remove of a button which was forgotten
2021-07-13 15:17:01 +02:00
Laurent Destailleur
b12aae4a99
FIX amount of payment deleted in unalterable log (for old record must
...
look the log of creation to know amount).
2021-07-13 14:26:32 +02:00
evarisk-theo
f0599095ee
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions
2021-07-13 14:04:14 +02:00
Théo David
66f38d0012
fix: rename select_tickets_list into selectTicketsList
2021-07-13 14:00:16 +02:00
Laurent Destailleur
af99cab839
CSS
2021-07-13 13:46:20 +02:00
Laurent Destailleur
e755d68b06
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:22:20 +02:00
Laurent Destailleur
0d12f25341
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-13 13:21:50 +02:00
Laurent Destailleur
d1a00c26aa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/functions.lib.php
2021-07-13 13:14:27 +02:00
Laurent Destailleur
bbce0f9c1b
Update html.form.class.php
2021-07-13 13:01:34 +02:00
Laurent Destailleur
f1c7207514
Merge pull request #18135 from Hystepik/develop#1
...
Fix #18110 : update of formticket.class.php
2021-07-13 11:48:36 +02:00
stickler-ci
85adefe721
Fixing style errors.
2021-07-13 08:08:01 +00:00
lmarcouiller
35b29481c7
Close #18131 : new massaction for thirdparty
2021-07-13 10:05:38 +02:00
Laurent Destailleur
d3f324c2d4
Try a better fix for #18105
2021-07-12 16:55:16 +02:00
stickler-ci
5b1525e77c
Fixing style errors.
2021-07-12 14:15:28 +00:00
lmarcouiller
cfb03f065c
Fix #18110 : update of formticket.class.php
2021-07-12 16:12:28 +02:00
Théo David
12e327d6b4
fix: remove phpcs:enable tag
2021-07-12 14:37:07 +02:00
Théo David
b59c1f1a34
fix: rename select_tickets into selectTickets
2021-07-12 14:17:30 +02:00
John BOTELLA
deb9a374f3
Fix ui event badge status
2021-07-12 12:28:21 +02:00
Laurent Destailleur
7533c9e3a5
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/fr_FR/interventions.lang
2021-07-12 12:01:53 +02:00
David
642d84a844
fix: code syntax
2021-07-12 09:26:18 +02:00
evarisk-theo
41b0735150
Merge branch 'Dolibarr:develop' into add-ticket-categories-functions
2021-07-12 09:10:15 +02:00
Laurent Destailleur
c9242d83ab
Clean code
2021-07-11 20:16:47 +02:00
Laurent Destailleur
fb13746644
Merge pull request #18019 from ATM-Consulting/NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
...
NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
2021-07-11 20:15:29 +02:00
ATM john
7ad1738944
Fix setError
2021-07-11 15:58:34 +02:00
ATM john
19ab5ce420
Fix comments
2021-07-11 14:13:24 +02:00
ATM john
dc3f960ce8
Add validate to module builder
2021-07-11 14:05:26 +02:00
Laurent Destailleur
25d6f1a7c8
More complete exemple.
2021-07-11 01:58:37 +02:00
Laurent Destailleur
e7b3280c17
Debug v14 with nojs
2021-07-11 01:12:52 +02:00
Laurent Destailleur
97ac547fe2
Fix/debug the numbering module to autocalculate a new lot.
2021-07-11 00:44:36 +02:00
Laurent Destailleur
64bd4ef784
Fix component to select ticket groups
2021-07-10 20:09:51 +02:00
Laurent Destailleur
f65aa6024f
Add replace into forbidden sql in read-only mode
2021-07-10 09:42:20 +02:00
Laurent Destailleur
3fadd5cda5
NEW Add $dolibarr_main_db_readonly in conf.php for readonly access.
2021-07-09 19:37:12 +02:00
Laurent Destailleur
e51e31dc11
Merge pull request #18087 from atm-john/new_modal_btn_option
...
New : Add js confirm modal option to BTN created with dolGetButtonAction
2021-07-09 10:09:08 +02:00
Florian Mortgat
924cff44f3
FIX PR feedback: in addFileIntoDatabaseIndex, return error if $object is set with an ID but without a table_element
2021-07-09 09:16:27 +02:00
Florian Mortgat
407f314498
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
2021-07-09 09:11:11 +02:00
Laurent Destailleur
d9475b8b2b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 23:46:35 +02:00
Laurent Destailleur
463fadb776
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-07-08 23:45:26 +02:00
Laurent Destailleur
aa9d98a336
Clean code of lib_notification. Now use cache like other js.
2021-07-08 23:20:55 +02:00
Laurent Destailleur
1306ff4c0b
Clean code of lib_notification. Now use cache like other js.
2021-07-08 23:19:43 +02:00
ATM john
c2ce8e3c9d
Fix comment
2021-07-08 22:29:41 +02:00
Laurent Destailleur
12b1f5b23b
Fix sql
2021-07-08 21:05:56 +02:00
Laurent Destailleur
797797d38b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 20:59:48 +02:00
Laurent Destailleur
1209253d57
Sanitize data
2021-07-08 18:12:15 +02:00
Alexandre SPANGARO
eaa6987e8b
Fix: formconfim if type radio must be :checked to get correct value
2021-07-08 17:15:03 +02:00
Laurent Destailleur
856d6eab4a
Merge pull request #18102 from altairisfr/expe_extra
...
FIX display of extrafields on shipping lines
2021-07-08 16:35:38 +02:00
Laurent Destailleur
b84fc94324
Merge pull request #18104 from fappels/14_fix_php8_warning_part4
...
14 fix php8 warning on user page
2021-07-08 16:31:25 +02:00
Laurent Destailleur
752b55ac98
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-08 14:04:07 +02:00
Laurent Destailleur
ad11f7b66d
Fix type of param
...
Fix test of ckeditor for html doc
Fix when MAIN_RESTRICTHTML_ONLY_VALID_HTML is on
2021-07-08 13:59:04 +02:00
Laurent Destailleur
16ee47b12c
Fix warning.
...
Reduce memory need for getmin/max on large graphs.
2021-07-08 11:13:15 +02:00
Laurent Destailleur
34c7295cbc
Make code more jquery compliant
2021-07-07 21:01:30 +02:00
Laurent Destailleur
9d3f7c5cdd
Support fk_parent into dictionary of ticket categories
2021-07-07 18:30:10 +02:00
Francis Appels
0e2c57fe65
Fix php 8 warning on user page
2021-07-07 14:50:10 +02:00
Christophe Battarel
7e174412b7
FIX display of extrafields on shipping lines
2021-07-07 10:30:01 +02:00
Laurent Destailleur
34f1cfe575
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/index.php
2021-07-07 02:09:53 +02:00
Laurent Destailleur
ff94c60cc7
Fix GETPOST with restricthtml
2021-07-07 01:45:31 +02:00
Laurent Destailleur
f286017cab
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 19:03:55 +02:00
Laurent Destailleur
f761a2d3b8
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-07-06 19:02:49 +02:00
Laurent Destailleur
9fc2d9fc03
Fix phpcs
2021-07-06 19:02:03 +02:00
Laurent Destailleur
82e96016cd
Merge pull request #18092 from fappels/14_fix_php8_part3
...
Fix php8 warning
2021-07-06 18:52:05 +02:00
Florian Mortgat
9f7be989c2
FIX 13.0 - fatal - missing inclusion of ajax.lib.php for calling ajax_autocompleter()
2021-07-06 17:38:37 +02:00
Laurent Destailleur
5444d45e68
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 16:13:40 +02:00
Laurent Destailleur
e1a45df0d8
Fix phpunit
2021-07-06 16:12:11 +02:00
Laurent Destailleur
ced4ea1314
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/tpl/objectline_view.tpl.php
2021-07-06 15:59:59 +02:00
Laurent Destailleur
3c0e841877
Fix function not found
2021-07-06 15:55:43 +02:00
Laurent Destailleur
37801184c0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/holiday/class/holiday.class.php
Fix case of newByMonth
2021-07-06 15:35:17 +02:00
Laurent Destailleur
1cfa43c085
Merge pull request #18088 from aspangaro/14p1
...
FIX Accountancy - Link from admin
2021-07-06 14:48:26 +02:00
Laurent Destailleur
555f1c719b
Debug v14
2021-07-06 04:29:25 +02:00
Laurent Destailleur
61ed899608
Fix set discount on line in TakePos
2021-07-06 03:53:42 +02:00
Laurent Destailleur
c901e518a7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-06 02:11:28 +02:00
Laurent Destailleur
3dff7e29cc
Fix #yogosha6567
2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc
Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML
2021-07-06 00:47:43 +02:00
Laurent Destailleur
2a5699a9a2
Merge
2021-07-05 23:07:40 +02:00
Laurent Destailleur
f8eadf6fe1
Fix #yogosha6561
2021-07-05 22:42:48 +02:00
Laurent Destailleur
db95339085
Code comment
2021-07-05 20:32:05 +02:00
Laurent Destailleur
a04ed363c7
Look and feel v14
2021-07-05 19:28:50 +02:00
Laurent Destailleur
e2d7de3146
css
2021-07-05 18:56:24 +02:00
Laurent Destailleur
adec77e449
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 18:47:24 +02:00
Laurent Destailleur
65adb16191
Fix increase entrophy of default password generation.
2021-07-05 17:55:17 +02:00
Laurent Destailleur
f648185839
Fix phpcs
2021-07-05 17:34:25 +02:00
Laurent Destailleur
c0118c7de2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-07-05 17:08:27 +02:00
Laurent Destailleur
d414bcb572
Fix phpcs
2021-07-05 17:08:10 +02:00
Laurent Destailleur
fe5c4f4a0e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-05 17:04:38 +02:00
Laurent Destailleur
8b07e99e05
Fix for ' inserted by CKEditor instead of '
2021-07-05 16:08:47 +02:00
Francis Appels
1333ca3660
Fix php 8 warning on not set field keys
2021-07-05 14:51:34 +02:00
Laurent Destailleur
b7c86f3aec
Fix ldap
2021-07-05 11:41:55 +02:00
Alexandre SPANGARO
8bde61c2c6
FIX Accountancy - Link from admin
2021-07-05 06:58:10 +02:00
ATM john
752fe22c68
Add simple auto mode
2021-07-04 23:24:38 +02:00
ATM john
a709cc583f
Add modal option to btn
2021-07-04 22:59:53 +02:00
Laurent Destailleur
5779a56ae0
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-04 21:23:53 +02:00
Laurent Destailleur
7013f01a41
Fix look and feel v14
2021-07-04 21:14:46 +02:00
Laurent Destailleur
f6efe51032
Fix trouble with product id = -1
2021-07-04 21:02:02 +02:00
Laurent Destailleur
5853aa4c1e
Look and feel v14
2021-07-04 20:08:34 +02:00
Laurent Destailleur
0cccfb1cee
Fix phpcs v14
2021-07-04 19:23:04 +02:00
Laurent Destailleur
d1c6a9899c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-07-03 18:33:00 +02:00
Laurent Destailleur
30f9eb9f23
Fix phpcs
2021-07-03 18:32:52 +02:00
Laurent Destailleur
9b7c0a9246
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2021-07-03 18:32:31 +02:00
Laurent Destailleur
b43fddfc74
Merge pull request #18058 from altairisfr/exportprices
...
add labels and export only latest prices
2021-07-02 16:35:58 +02:00
Laurent Destailleur
dbd2d2eb20
Merge pull request #18069 from marc-dll/13.0_FIX_holiday_menus
...
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 16:35:14 +02:00
Laurent Destailleur
6ae1d192e4
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/compta/facture/card.php
2021-07-02 16:14:12 +02:00
Laurent Magnin
db0b00f93a
Standard ticket substitutions
2021-07-02 12:30:07 +02:00
John BOTELLA
167ae5b0f2
Merge branch 'develop' into new_validation_method_for_common_object
2021-07-02 12:04:14 +02:00
Laurent Magnin
b2e0a530a0
Merge branch 'Dolibarr:develop' into fix_ticket_substitution
2021-07-02 11:49:55 +02:00
Marc de Lima Lucio
97938f489e
FIX: holiday: status filter parameter has been renamed but not in links it was used
2021-07-02 11:35:26 +02:00
Théo David
079608fe00
NEW #18046 Add ticket ticket categories functions
2021-07-02 10:26:03 +02:00
Frédéric FRANCE
3aa24cccff
fix can't remove extrafield date or datetime value
2021-07-01 15:15:35 +02:00
Laurent Destailleur
9392624e54
Fix deletion of line on replacement invoice
2021-07-01 13:36:04 +02:00
Laurent Destailleur
5b34ea6c22
FIX permission to close a proposal when using advanced permissions
2021-07-01 03:06:40 +02:00
Laurent Destailleur
4cff865c6b
Trans
2021-06-30 18:22:40 +02:00
Laurent Destailleur
bf7f8f7c45
Fix phpcs
2021-06-30 17:28:23 +02:00
Laurent Destailleur
aec4d6016c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:40 +02:00
Laurent Destailleur
6cb5ea6ec2
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-30 17:27:20 +02:00
Laurent Destailleur
bda36337cd
Prepare fix #yogosha6443
2021-06-30 17:22:36 +02:00
Christophe Battarel
ac6cb5853e
fix for multientity
2021-06-30 15:35:55 +02:00
Laurent Destailleur
7c2121c439
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/tpl/objectline_edit.tpl.php
2021-06-30 15:06:16 +02:00
Laurent Destailleur
068622bced
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2021-06-30 15:00:23 +02:00
Laurent Destailleur
a914ffa42c
CSS
2021-06-30 15:00:04 +02:00
Laurent Destailleur
b6a538f439
Merge pull request #18056 from aspangaro/14b16
...
FIX Accountancy - Clean virtual zero on the import
2021-06-30 14:44:12 +02:00
Laurent Destailleur
51456741d9
FIX Can't edit replacement invoice
...
FIX Status of invoice when making a replacement invoice
2021-06-30 12:43:44 +02:00
Christophe Battarel
3b4ea5c5af
use formintervention
2021-06-30 10:56:09 +02:00
Christophe Battarel
27e2c62cab
Merge branch 'develop' into timespent2inter
2021-06-30 10:34:22 +02:00
Christophe Battarel
4f2e579bb2
add labels and export only latest prices
2021-06-30 10:21:31 +02:00
Christophe Battarel
0b5e231dd5
add labels and export only latest prices
2021-06-30 10:18:14 +02:00
Florian Mortgat
5d4c40fffa
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_develop_addFileIntoDatabaseIndex_facilitate_setting_description_and_keyword
2021-06-30 09:36:34 +02:00
Florian Mortgat
94416072d8
FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead)
2021-06-30 09:34:49 +02:00
Alexandre SPANGARO
f95b5be971
FIX Accountancy - Clean virtual zero on the import
2021-06-30 04:55:22 +02:00
Alexandre SPANGARO
6f12812329
FIX Accountancy - Clean virtual zero on the import
2021-06-29 23:07:20 +02:00
Laurent Destailleur
02a5755876
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/langs/nl_NL/main.lang
2021-06-29 19:59:51 +02:00
Laurent Destailleur
6196a77e64
Merge pull request #17861 from marc-dll/develop_NEW_project_block_timesheet
...
NEW: project time spent: conf to prevent recording time after X months
2021-06-29 19:53:20 +02:00
Laurent Destailleur
c7befd9acc
Fix php8 (related to #18019 )
2021-06-29 19:49:37 +02:00
Laurent Destailleur
eab6fc9347
Merge pull request #18053 from fappels/14_fix_php8_part2
...
Fix php8 warning
2021-06-29 19:17:09 +02:00
Laurent Destailleur
2860e12b65
Update objectline_view.tpl.php
2021-06-29 19:16:29 +02:00
Laurent Destailleur
0f020d5b20
Fix for phpv8
2021-06-29 19:05:18 +02:00
Laurent Destailleur
7aeb652c66
Better sanitizing, fix phpcs
2021-06-29 18:22:36 +02:00
Laurent Destailleur
796b2d201a
Enhance the sanitizing.
2021-06-29 18:17:27 +02:00
Francis Appels
1b7b45d72a
Merge remote-tracking branch 'Dolibarr/14.0' into 14_fix_php8_part2
2021-06-29 16:56:48 +02:00
Francis Appels
051bb3f3ef
Fix some core php8 warnings.
...
Fixing php 8 warnings seems also to solve some situations like a paiment condition removed from dictionary can not be selected.
2021-06-29 16:37:07 +02:00
lmarcouiller
3d41c00199
New : selectGroupTicket multilevel >1 level
2021-06-29 16:13:03 +02:00
Laurent Destailleur
25c6b64b1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
htdocs/core/modules/reception/doc/pdf_squille.modules.php
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
2021-06-29 15:58:26 +02:00
Christophe Battarel
c8f55907eb
stickler
2021-06-29 15:52:50 +02:00
Laurent Destailleur
1cf3408f5b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/class/contact.class.php
2021-06-29 15:52:39 +02:00
Christophe Battarel
d423e47d3b
stickler
2021-06-29 15:50:41 +02:00
Laurent Destailleur
ba4a01dbea
Merge pull request #18037 from atm-maxime/fix_mo_stuff
...
Fix MO and BOM links in boxes
2021-06-29 15:42:09 +02:00
Laurent Destailleur
ab4dbcf5ae
Update box_mos.php
2021-06-29 15:41:48 +02:00
Laurent Destailleur
474df5fef2
Update box_boms.php
2021-06-29 15:41:21 +02:00
Christophe Battarel
ef8aaa7fd7
generate intervention from time spent
2021-06-29 15:26:04 +02:00
Laurent Destailleur
69e0381e55
Prepare v14
2021-06-29 02:39:20 +02:00
Francis Appels
9b59f264fd
Fix some php 8 warning
2021-06-28 20:00:10 +02:00
Laurent Destailleur
2e2d9002ad
Code comment
2021-06-27 14:54:17 +02:00
Maxime Kohlhaas
8332385bd5
Fix links in box last BOM
2021-06-27 08:42:08 +02:00
Maxime Kohlhaas
d86caa39e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_mo_stuff
2021-06-27 08:34:11 +02:00
Laurent Destailleur
4ff2ff779b
css
2021-06-26 16:35:33 +02:00
Laurent Destailleur
b3b96ddb7a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-26 16:11:13 +02:00
Laurent Destailleur
bbc6b9aa1b
Look and feel v14
2021-06-26 16:10:56 +02:00
Laurent Destailleur
e62ed28701
Debug v14
2021-06-26 15:39:52 +02:00
Laurent Destailleur
f4a512fa7b
Merge pull request #18004 from OPEN-DSI/new-export-parent-compnay-document-lines
...
NEW parent company on exports
2021-06-26 12:30:57 +02:00
Laurent Destailleur
97f5a0e541
Merge pull request #18018 from frederic34/patch-7
...
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
2021-06-26 12:24:01 +02:00
Laurent Destailleur
781df5a8a8
Merge pull request #18016 from fappels/13_fix_klaas
...
FIX #17919 pictures in docs.
2021-06-26 12:22:57 +02:00
Laurent Destailleur
012f326168
Merge pull request #18020 from Hystepik/develop#1
...
Fix : error display fr phone number
2021-06-26 12:18:16 +02:00
Laurent Destailleur
2fd47615eb
Fix load of conf when using alternative $db
2021-06-26 01:46:14 +02:00
Laurent Destailleur
6e3647af2c
Debug v14
2021-06-26 00:08:19 +02:00
Laurent Destailleur
c7b03da7e6
Fix bad object used
2021-06-25 23:43:22 +02:00
lvessiller
2cb2ec02d6
NEW parent compnay in order supplier lines export
2021-06-25 17:04:19 +02:00
Francis Appels
ec805d36fe
Remove deprecated level parameter.
2021-06-25 10:02:23 +02:00
lmarcouiller
98244a5e44
Fix : error display fr phone number
2021-06-24 14:20:19 +02:00
Francis Appels
88f7ca9214
Fix MAIN_GENERATE_RECEPTION_WITH_PICTURE
2021-06-24 12:27:39 +02:00
Laurent Destailleur
cfc5646059
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-24 12:18:30 +02:00
Laurent Destailleur
a2d451dbfb
Missing extrafield on report
2021-06-24 12:17:32 +02:00
Francis Appels
dc9e71084b
Fix missing posYAfterImage for nexy for espadon and squille
2021-06-24 12:15:29 +02:00
Frédéric FRANCE
47b1d2b7df
export value of checkbox instead id with EXPORT_LABEL_FOR_SELECT
2021-06-24 11:54:05 +02:00
Florian Mortgat
d0a4ae88b1
NEW: make it easier to set the keyword, keywords and description attributes of an ecm file object
2021-06-24 11:50:34 +02:00
Francis Appels
d20bd5bcf6
fix ctrl-y
2021-06-24 10:18:21 +02:00
Francis Appels
09382e0505
FIX #17919 pictures in docs.
...
Supplier order and proposal worked for me.
Supplier invoice not implemented need new feature request.
2021-06-24 10:12:34 +02:00
atm-lena
7eddf43aef
FIX List and Create Companies Left Menus
2021-06-23 17:33:02 +02:00
Laurent Destailleur
4327d53c60
Fix closing linkto section when js on.
2021-06-23 14:38:24 +02:00
Laurent Destailleur
acce226c05
Debug cash fence feature (missing report per vat rate)
2021-06-23 13:00:50 +02:00
Laurent Destailleur
82ee5c2825
Clean code
2021-06-23 10:42:27 +02:00
Laurent Destailleur
d57699b7d7
css
2021-06-23 10:22:51 +02:00
Laurent Destailleur
5c6c708531
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-23 02:45:22 +02:00
Laurent Destailleur
40b35cc44a
Fix upload file form has disappear
2021-06-23 02:45:06 +02:00
Laurent Destailleur
30087bd16a
Merge pull request #18001 from aspangaro/14b15
...
Fix Forget information in tooltip for direct download
2021-06-23 02:31:45 +02:00
Laurent Destailleur
cf28fcc8cd
CSS
2021-06-23 02:22:49 +02:00
Laurent Destailleur
62822c424c
Fix php8
2021-06-23 01:34:14 +02:00
Laurent Destailleur
c08255657e
Fix pgsql
2021-06-22 18:59:14 +02:00
Laurent Destailleur
12748640a5
Add log
2021-06-22 18:04:06 +02:00
Laurent Destailleur
bcffbe3d67
Test fix
2021-06-22 17:09:02 +02:00
Laurent Destailleur
2f6a91f506
Look and feel v14
2021-06-22 15:25:49 +02:00
lvessiller
21ebfb6094
NEW parent company on exports
2021-06-22 14:13:18 +02:00
Alexandre SPANGARO
f1a5d4009f
Merge remote-tracking branch 'upstream/develop' into 14b15
2021-06-22 14:07:52 +02:00
Laurent Destailleur
d6e9947cd4
CSS
2021-06-22 12:30:50 +02:00
Laurent Destailleur
8887f71c26
Doc
2021-06-22 10:57:16 +02:00
ATM john
b8244edb89
Merge branch 'new_validation_method_for_common_object' of github.com:atm-john/dolibarr into new_validation_method_for_common_object
2021-06-21 21:54:53 +02:00
ATM john
4d043b713c
WIP - create validation method for common object
2021-06-21 21:54:03 +02:00
Alexandre SPANGARO
23f6e183d3
Forget information in tooltip for direct download
2021-06-21 21:51:41 +02:00
Laurent Destailleur
6014e4407f
Clean code
2021-06-21 20:50:56 +02:00
Laurent Destailleur
a0b594fbdc
Debug emailcollector
2021-06-21 19:47:43 +02:00
kamel
488d875854
Correction
2021-06-21 16:51:54 +02:00
kamel
dd61c49722
Correction
2021-06-21 16:44:31 +02:00
kamel
ba7b6a8d51
FIX: Reload values of the specified entity when change entity in the execution of cron job
2021-06-21 16:38:36 +02:00
Laurent Destailleur
31db1dc412
Fix management of visibility of export/import templates.
2021-06-21 15:03:45 +02:00
Laurent Destailleur
561e75d0f8
Merge pull request #17992 from frederic34/patch-8
...
fix warnings
2021-06-21 11:39:40 +02:00
Laurent Destailleur
bb8d5cec1b
More complete management of
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:36:28 +02:00
Laurent Destailleur
5bfd82e528
Clean code
2021-06-21 11:23:53 +02:00
Laurent Destailleur
59a7d5b89d
Introduce option
...
MAIN_USE_VAT_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID_ARE_INDIVIDUAL
2021-06-21 11:13:30 +02:00
Maxime Kohlhaas
2d9d46b9b5
Merge branch 'develop' of github.com:atm-maxime/dolibarr into fix_mo_stuff
2021-06-20 21:08:28 +02:00
Frédéric FRANCE
6fb17b9777
fix warnings
2021-06-20 18:28:25 +02:00
Laurent Destailleur
c78f4a9248
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 17:20:24 +02:00
Laurent Destailleur
65110411ac
Doc
2021-06-20 17:20:12 +02:00
Laurent Destailleur
f486595e13
Fix dolSqlDateFilter
2021-06-20 16:55:22 +02:00
Laurent Destailleur
3b09cc8e16
Merge pull request #17988 from frederic34/patch-7
...
fix php warning
2021-06-20 16:40:25 +02:00
Laurent Destailleur
5ad999e46d
css
2021-06-20 16:39:30 +02:00
Laurent Destailleur
6aeba1b79d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-20 16:36:05 +02:00
Laurent Destailleur
68b8a6a916
css
2021-06-20 16:35:49 +02:00
Frédéric FRANCE
4739694ad7
fix php warning
2021-06-20 16:24:58 +02:00
Laurent Destailleur
ab34a105c7
Merge pull request #17985 from grandoc/new_branch_20_06_2021
...
internationalization
2021-06-20 12:54:18 +02:00
Laurent Destailleur
a9dd5e8764
Fix css hidoneprint
2021-06-20 12:52:04 +02:00
Philippe GRAND
ae293d61c6
internationalization
2021-06-20 11:59:02 +02:00
Philippe GRAND
fb13d74467
internationalization
2021-06-20 11:56:49 +02:00
Philippe GRAND
dbee213db1
internationalization
2021-06-20 11:54:51 +02:00
Philippe GRAND
1480123f7d
internationalization
2021-06-20 11:53:21 +02:00
Philippe GRAND
e33db2876a
internationalization
2021-06-20 11:51:02 +02:00
Philippe GRAND
c06fcd36fb
internationalization
2021-06-20 11:48:30 +02:00
Philippe GRAND
d60d15883f
internationalization
2021-06-20 11:46:22 +02:00
Philippe GRAND
a4e63a1a26
internationalization
2021-06-20 11:43:05 +02:00
Philippe GRAND
057e78d8c3
internationalization
2021-06-20 11:40:54 +02:00
Philippe GRAND
b07d2f257a
internationalization
2021-06-20 11:37:51 +02:00
Philippe GRAND
14af45057c
internationalization
2021-06-20 11:35:37 +02:00
Philippe GRAND
748c10c2f9
internationalization
2021-06-20 11:32:25 +02:00
Philippe GRAND
1207944761
internationalization
2021-06-20 11:29:47 +02:00
Philippe GRAND
9ccc9d0d3d
internationalization
2021-06-20 11:27:49 +02:00
Philippe GRAND
93512fd501
internationalization
2021-06-20 11:26:25 +02:00
Philippe GRAND
ddaa9ecfc1
internationalization
2021-06-20 11:24:36 +02:00
Philippe GRAND
9acbb984a1
internationalization
2021-06-20 11:22:17 +02:00
Philippe GRAND
e5083d18af
internationalization
2021-06-20 11:20:20 +02:00
Philippe GRAND
5977fe23e7
internationalization
2021-06-20 11:18:07 +02:00
Philippe GRAND
f8187eb70e
internationalization
2021-06-20 11:16:03 +02:00
Philippe GRAND
0d60323e41
internationalization
2021-06-20 11:13:31 +02:00
Philippe GRAND
e2ef205036
internationalization
2021-06-20 11:11:41 +02:00
Philippe GRAND
d3a9b03c89
internationalization
2021-06-20 11:08:53 +02:00
Philippe GRAND
f4199ca99e
internationalization
2021-06-20 11:06:04 +02:00
Philippe GRAND
e5f43cc678
internationalization
2021-06-20 11:03:28 +02:00
Philippe GRAND
33ffb8b943
internationalization
2021-06-20 11:01:38 +02:00
Philippe GRAND
e61d60e125
internationalization
2021-06-20 10:49:05 +02:00
Laurent Destailleur
e3e2dfd764
Fix generation of ODT (test if temporary directory is writable)
2021-06-20 05:11:46 +02:00
Laurent Destailleur
1a6647e690
Debug v14
2021-06-20 04:10:25 +02:00
Laurent Destailleur
ce818d4f44
Debug doc templates of ODF
2021-06-20 03:41:45 +02:00
Laurent Destailleur
8df9815049
Add warning to help understand bug of post_max_size.
2021-06-20 01:04:16 +02:00
Laurent Destailleur
0e80784de9
Add warning to help understand bug of post_max_size.
2021-06-20 00:32:25 +02:00
Laurent Destailleur
bf460526c0
Add warning when submiting file larger than post_max_size.
2021-06-20 00:27:24 +02:00
Laurent Destailleur
4a3da84098
Clean code
2021-06-19 23:52:52 +02:00
Laurent Destailleur
414b5e612f
Better info on upload size limit
2021-06-19 22:11:16 +02:00
Laurent Destailleur
edb4cf4130
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
README.md
htdocs/filefunc.inc.php
2021-06-19 20:05:25 +02:00
Laurent Destailleur
f303e6664b
Fix reposition do not add several times the page_y parameter.
2021-06-19 15:32:20 +02:00
Marc GUENNEUGUES
4346958455
Correct rights in core/ajax/row.php
2021-06-18 20:03:03 +02:00
Gauthier PC portable 024
50bc832532
FIX : better correction
2021-06-17 10:48:48 +02:00
Laurent Destailleur
61bd572a9c
Fix token for ajax call
2021-06-17 03:37:52 +02:00
Laurent Destailleur
3754c2c3c9
Fix name of field
2021-06-17 00:59:11 +02:00
Laurent Destailleur
f850f058fa
Look and feel v14
2021-06-16 21:06:55 +02:00
Laurent Destailleur
8c18837095
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-16 19:01:03 +02:00
Laurent Destailleur
f6998d7c32
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
2021-06-16 19:00:52 +02:00
Gauthier PC portable 024
657972b79b
FIX : Tracking number label shouldn't be displaied on "espadon" model if shipping tracking number is empty
2021-06-16 16:49:24 +02:00
Laurent Destailleur
b2221d2c3a
Update extrafields.class.php
2021-06-16 14:31:22 +02:00
Antonin MARCHAL
d5cb81982d
fix wrong display on extrafields type = double
2021-06-16 14:21:23 +02:00
Frédéric FRANCE
5d79143401
fix php warning
2021-06-16 11:50:52 +02:00
Laurent Destailleur
e503f73e95
Comment dead code
2021-06-15 22:28:39 +02:00
Laurent Destailleur
8b238c43ce
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:23:46 +02:00
Laurent Destailleur
36f599519e
Merge pull request #17935 from frederic34/patch-8
...
fix php warning
2021-06-15 22:18:26 +02:00
Laurent Destailleur
6bf8e425c5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-15 22:18:07 +02:00
Laurent Destailleur
87a19af86d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/tpl/contacts.tpl.php
2021-06-15 22:17:53 +02:00
Laurent Destailleur
2a3b330e1e
Fix newToken()
2021-06-15 22:10:59 +02:00
Laurent Destailleur
ac7ad64737
Merge pull request #17934 from frederic34/patch-7
...
fix php warning
2021-06-15 22:08:37 +02:00
Laurent Destailleur
5ddf12b29c
Fix set language
2021-06-15 22:06:26 +02:00
Laurent Destailleur
1c87420895
Fix #yogosha6411
2021-06-15 20:22:36 +02:00
Laurent Destailleur
3a5770f679
Clean code
2021-06-15 20:16:05 +02:00
Laurent Destailleur
83ec4cbd71
Reponsive
2021-06-15 15:19:46 +02:00
Laurent Destailleur
80760d7960
Fix permissions
2021-06-15 14:18:09 +02:00
Frédéric FRANCE
5ceb957059
fix php warning
2021-06-15 08:48:52 +02:00
Frédéric FRANCE
8fbdde9ec3
Update contacts.tpl.php
2021-06-15 08:43:14 +02:00
Frédéric FRANCE
cd615b1717
fix php warning
2021-06-15 08:31:08 +02:00
Laurent Destailleur
3b9936f7e2
Fix responsive
2021-06-15 01:18:17 +02:00
stickler-ci
82f195dc30
Fixing style errors.
2021-06-14 19:15:53 +00:00
ATM john
be367c589f
WIP - create validation method for common object
2021-06-14 21:12:48 +02:00
ATM john
23765bf459
WIP - create validation method for common object
2021-06-14 20:59:46 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2021-06-14 13:37:02 +00:00
Laurent Destailleur
617338cccd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-14 14:50:15 +02:00
Laurent Destailleur
4464aeb639
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-06-14 14:44:08 +02:00
Laurent Destailleur
6078267f86
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
2021-06-14 14:43:46 +02:00
Laurent Destailleur
dcca3011ee
Clean code
2021-06-14 14:41:50 +02:00
Laurent Destailleur
e41a3a2f42
Merge pull request #17867 from OPEN-DSI/v11-fix-clone-invoice-with-acount-line
...
FIX clone invoice with acount line
2021-06-14 14:41:05 +02:00
Laurent Destailleur
b588aee704
Merge pull request #17917 from fappels/14_create_thumbs_php8.0
...
Fix create image thumbs on php 8.0
2021-06-14 14:07:21 +02:00
Laurent Destailleur
03fbd68da4
Update images.lib.php
2021-06-14 14:05:48 +02:00
Laurent Destailleur
5cc86d2319
Fix #yogosha6370
2021-06-14 13:51:09 +02:00
Laurent Destailleur
046215f64a
Fix PHP8
2021-06-14 02:08:28 +02:00
Laurent Destailleur
f8f951977c
Debug v14
2021-06-14 01:33:01 +02:00
Francis Appels
a019996bc8
Fix create image thumbs on php 8.0
2021-06-13 17:36:51 +02:00
Laurent Destailleur
026d919a03
Merge pull request #17900 from frederic34/patch-7
...
fix warnings
2021-06-13 16:15:58 +02:00
Frédéric FRANCE
ebc0cc75dd
fix warning
2021-06-13 15:37:54 +02:00
Laurent Destailleur
abfc87c1de
Fix separator extrafields must not appear as selected fields
2021-06-13 13:32:41 +02:00
Laurent Destailleur
8b9af8f5ab
Responsive
2021-06-13 01:27:04 +02:00
Laurent Destailleur
9ba0fe07f0
Fix phpcs
2021-06-12 18:47:29 +02:00
Frédéric FRANCE
a723a8f93e
remove phpcs warning
2021-06-12 18:40:00 +02:00
ATM john
43ecba2e63
WIP - create validation method for common object
2021-06-12 14:16:40 +02:00
ATM john
578dc9adde
WIP - create validation method for common object
2021-06-12 12:58:20 +02:00
Laurent Destailleur
1933072712
Merge pull request #17893 from atm-john/develop_fix_missing_hooks_for_stock_mvm
...
New : Missing hook for stock movements list
2021-06-11 19:58:21 +02:00
Laurent Destailleur
bbb751dc53
Merge pull request #17822 from frederic34/zapier_create_contacts
...
add more capabilities for zapier
2021-06-11 19:51:01 +02:00
Laurent Destailleur
04a500f516
Merge pull request #17850 from moreauftheobald/Develop_hook_on_product_stat
...
Adding hooks on product stat in order to allow to expand stat on othe…
2021-06-11 19:33:37 +02:00
Laurent Destailleur
5d2f5b2305
Update product.lib.php
2021-06-11 19:33:07 +02:00
Laurent Destailleur
37ebedcafa
Update product.lib.php
2021-06-11 19:32:25 +02:00
Laurent Destailleur
756786f717
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/list.php
htdocs/core/class/discount.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/modules/modFournisseur.class.php
htdocs/fourn/facture/card.php
htdocs/holiday/list.php
htdocs/paybox/admin/paybox.php
htdocs/paypal/admin/paypal.php
htdocs/product/price.php
htdocs/projet/activity/perday.php
htdocs/projet/activity/permonth.php
htdocs/projet/activity/perweek.php
htdocs/stripe/admin/stripe.php
2021-06-11 19:05:05 +02:00
Laurent Destailleur
a057f17e56
Merge pull request #17878 from AlexisLaurier/fix/depositTranslationInInvoice
...
remove useless check on invoice line content when generating pdf
2021-06-11 18:13:58 +02:00
Laurent Destailleur
9e6890c719
Merge pull request #17884 from frederic34/patch-12
...
fix warning
2021-06-11 18:02:54 +02:00
Laurent Destailleur
ffb879d152
Merge pull request #17880 from frederic34/patch-8
...
fix warning
2021-06-11 18:02:45 +02:00
Laurent Destailleur
fbe970c739
Merge pull request #17879 from frederic34/patch-7
...
try to fix
2021-06-11 18:02:29 +02:00
Laurent Destailleur
0b4385b554
Merge pull request #17885 from frederic34/patch-13
...
fix warnings
2021-06-11 18:00:48 +02:00
Laurent Destailleur
0bbe2210f2
FIX #17649
2021-06-11 17:58:52 +02:00
Laurent Destailleur
92dc0d28ce
Fix disallow reserved values for field name
2021-06-11 17:50:52 +02:00
Laurent Destailleur
73a1119b26
Clean code
2021-06-11 15:21:24 +02:00
Laurent Destailleur
1605564d5e
Clean code
2021-06-11 14:54:18 +02:00
John BOTELLA
99cada2d43
Fix missing hooks
2021-06-11 14:42:51 +02:00
Laurent Destailleur
e17ab1cca6
Clean code
2021-06-11 09:22:01 +02:00
Laurent Destailleur
b0b2bb4d86
Fix trans
2021-06-11 09:20:59 +02:00
Frédéric FRANCE
f58cf14ae9
Update html.formmail.class.php
2021-06-10 22:28:19 +02:00
Frédéric FRANCE
86f39795c0
fix warnings
2021-06-10 22:26:58 +02:00
Frédéric FRANCE
acc41adb8d
fix warning
2021-06-10 22:22:24 +02:00
stickler-ci
82feb57fcf
Fixing style errors.
2021-06-10 19:56:03 +00:00
Marc de Lima Lucio
1e7df0ba9f
NEW: holiday: handle monthly updates with cronjob
2021-06-10 21:53:06 +02:00
Frédéric FRANCE
759472f5d1
fix warning
2021-06-10 20:58:56 +02:00
Frédéric FRANCE
3cb17d7535
fix warning
2021-06-10 20:40:10 +02:00
Frédéric FRANCE
648c1ef3a6
try to fix
2021-06-10 20:32:45 +02:00
Laurent Destailleur
4e87a08282
Try fix for #17866
2021-06-10 19:02:53 +02:00
Alexis LAURIER
1a2434818d
remove useless check on deposit line content when generating pdf
2021-06-10 18:00:49 +02:00
Laurent Destailleur
1bf63c7862
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/lib/functions.lib.php
2021-06-10 16:53:09 +02:00
Laurent Destailleur
c44a368213
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-06-10 16:47:53 +02:00
Laurent Destailleur
24f8b6386e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2021-06-10 16:47:45 +02:00
stickler-ci
aae636bdc7
Fixing style errors.
2021-06-10 12:28:26 +00:00
Quentin VIAL-GOUTEYRON
1d279dedaa
missing &
2021-06-10 14:24:01 +02:00
Quentin VIAL-GOUTEYRON
71386479ad
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_multiple_order_linked_to_facture
2021-06-10 14:22:15 +02:00
Laurent Destailleur
92b20d3595
Merge pull request #17831 from atm-john/11.0_fix_doc_childtablesoncascade
...
FIX : childtablesoncascade doc
2021-06-10 12:59:19 +02:00
Laurent Destailleur
8a46fd376f
Update commonobject.class.php
2021-06-10 12:58:42 +02:00
Laurent Destailleur
1666e1277b
Merge pull request #17851 from atm-john/13.0_fix_php7_warning
...
Fix php 7 warning : Only variables should be passed by reference
2021-06-10 12:20:26 +02:00
Laurent Destailleur
32491dc668
Merge pull request #17868 from prolyfix/patch-1
...
bug resolution: exception
2021-06-10 12:09:20 +02:00
Laurent Destailleur
c4dcad5e6b
Fix regression
2021-06-10 11:57:42 +02:00
Laurent Destailleur
ea0db5a574
Fix popup of invoice
2021-06-10 01:10:35 +02:00
Laurent Destailleur
c40bc085b2
Fix v14
2021-06-10 00:55:10 +02:00
Laurent Destailleur
9afe8e54a7
Fix
2021-06-10 00:41:15 +02:00
Laurent Destailleur
067f37e22e
Clean code
2021-06-10 00:09:38 +02:00
prolyfix
e4d3fd4861
bug resolution: exception
...
when a user test the send mail functionality, an exception is thrown: $object is null in the method_exists's function. and thus not allowed.
Adding is_object resolve the problem
2021-06-09 23:09:31 +02:00
Laurent Destailleur
f472ff4fd9
Add phpunit for dol_eval
2021-06-09 17:47:27 +02:00
Laurent Destailleur
f1c94ac659
NEW Reduce scope of dol_eval function.
2021-06-09 17:44:42 +02:00
lvessiller
c37c371392
FIX clone invoice with acount line
2021-06-09 17:18:01 +02:00
Laurent Destailleur
0b7b12685f
Clean code
2021-06-09 16:41:43 +02:00
Laurent Destailleur
2681d58107
FIx CVE ID: CVE-2021-33816
2021-06-09 16:41:31 +02:00
Laurent Destailleur
fb46ece906
Fix yogosha 6347
2021-06-09 15:36:47 +02:00
Dorian Vabre
0a23cf029d
using strlen instead of count
2021-06-09 14:13:50 +02:00
Laurent Destailleur
c375668ab6
Clean code
2021-06-09 12:41:53 +02:00
Gauthier PC portable 024
4b6fb7dd47
FIX : auto rounding on "_FORMATED_" tags
2021-06-09 12:26:28 +02:00
Marc de Lima Lucio
4c6dfd8d5c
Merge branch 'NEW_13.0_project_block_timesheet' of github.com:marc-dll/dolibarr into develop
2021-06-09 11:03:04 +02:00
MOREAU FRANCK
a141d722ad
Adding hooks on product stat in order to allow to expand stat on other modules
...
stickler-ci test corrections
2021-06-09 08:39:06 +02:00
Marc de Lima Lucio
6733d278d8
NEW: project time spent: conf to prevent recording time after X months
2021-06-08 18:13:18 +02:00
MOREAU FRANCK
4b8dfc1abe
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 18:11:59 +02:00
MOREAU FRANCK
2e66509245
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 15:47:20 +02:00
Laurent Destailleur
1aeb91eb9a
FIX entry menus that has been lost in v13
...
Look and feel v14
2021-06-08 13:44:11 +02:00
John BOTELLA
5131ab5199
Fix php 7 warning : Only variables should be passed by reference
2021-06-08 12:36:08 +02:00
MOREAU FRANCK
207dc1df55
Adding hooks on product stat in order to allow to expand stat on other modules
2021-06-08 12:34:26 +02:00
stickler-ci
453ff4aa66
Fixing style errors.
2021-06-07 14:19:06 +00:00
Quentin VIAL-GOUTEYRON
66f7085225
Merge branch '12.0' of https://github.com/Dolibarr/dolibarr into FIX_multiple_order_linked_to_facture
2021-06-07 16:02:16 +02:00
Quentin VIAL-GOUTEYRON
d6c6170e9d
fix multiple order linked to invoice
2021-06-07 16:01:58 +02:00
Laurent Destailleur
0144d6c0fd
Inventory is now stable feature
2021-06-07 11:30:46 +02:00
Laurent Destailleur
d6cbb9007f
Debug ticket form to add a local file
2021-06-07 01:43:24 +02:00
Laurent Destailleur
242f8b2544
Debug v14
2021-06-07 01:23:34 +02:00
Maxime Kohlhaas
a63d3364b4
Fix links in box last MO
2021-06-06 22:51:27 +02:00
ATM john
801f6cab2d
WIP - create validation method for common object
2021-06-06 21:58:59 +02:00
ATM john
f1b1dcd1b1
WIP - create validation method for common object
2021-06-06 21:53:17 +02:00
ATM john
aa94d40ad0
WIP - create validation method for common object
2021-06-06 21:12:03 +02:00
Frédéric FRANCE
8401fa3ce7
add trigger member
2021-06-06 17:57:48 +02:00
Frédéric FRANCE
a0f0c86ae6
Merge remote-tracking branch 'upstream/develop' into zapier_create_contacts
2021-06-06 17:09:35 +02:00
Laurent Destailleur
9f177a0c63
Debug v14
2021-06-06 16:36:41 +02:00
Laurent Destailleur
a1bb7129da
Debug v14
2021-06-06 15:29:49 +02:00
ATM john
1aca7efce3
Fix childtablesoncascade doc
2021-06-06 13:15:03 +02:00
Frédéric FRANCE
efb5ec2901
search by name or email
2021-06-06 10:32:04 +02:00
Laurent Destailleur
70af18148b
Debug modulebuilder v14
2021-06-05 17:49:01 +02:00
Laurent Destailleur
273c4c2880
Fix typo
2021-06-05 15:28:41 +02:00
Laurent Destailleur
fb0d2cdddc
Debug v14
2021-06-05 15:27:49 +02:00
Laurent Destailleur
1e657b8621
Fix value of showoncombobox
2021-06-05 15:14:10 +02:00
Laurent Destailleur
ddbfb5d734
Fix translation of note of product
2021-06-05 11:14:06 +02:00
Laurent Destailleur
7a93365836
Fix bad name of var
2021-06-05 11:07:38 +02:00
Frédéric FRANCE
f6bc1c6414
add trigger contact
2021-06-05 09:37:38 +02:00
Laurent Destailleur
b6ba1de3b3
Fix remove use of captcha on backoffice for ticket creation
2021-06-05 02:18:45 +02:00
Laurent Destailleur
0147ffa737
Fix css
2021-06-04 14:38:22 +02:00
Laurent Destailleur
333cd9f48a
Merge pull request #17750 from daraelmin/patch-2
...
Fix #17743 newpayement source membersubscription is member
2021-06-04 13:04:17 +02:00
Laurent Destailleur
a94ef88549
Merge pull request #17748 from frederic34/patch-13
...
Update pdf_canelle.modules.php
2021-06-04 12:34:27 +02:00
Laurent Destailleur
f656214a66
Merge pull request #17746 from frederic34/patch-12
...
doxygen
2021-06-04 12:32:26 +02:00
Laurent Destailleur
f7c5a9e13a
Merge pull request #17757 from frederic34/patch-19
...
fix warning
2021-06-04 11:54:26 +02:00
Laurent Destailleur
702de427bd
Merge pull request #17758 from frederic34/patch-20
...
fix warnings
2021-06-04 11:52:53 +02:00
Laurent Destailleur
c67ea954f7
Merge pull request #17752 from frederic34/patch-14
...
fix warnings
2021-06-04 11:51:01 +02:00
Laurent Destailleur
c3ed30345e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-06-04 11:45:24 +02:00
Laurent Destailleur
2586fcd1a3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/commande/class/commandestats.class.php
htdocs/user/class/usergroup.class.php
2021-06-04 11:04:18 +02:00
Laurent Destailleur
b31b210324
Merge pull request #17773 from Hystepik/develop#4
...
New : add of a new param in selectGroupTicket
2021-06-04 10:37:18 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note
...
ADD note to supplier order refusal
2021-06-04 10:10:17 +02:00
Laurent Destailleur
ce64ebc167
Merge pull request #17805 from frederic34/patch-22
...
fix warning
2021-06-04 08:58:53 +02:00
Laurent Destailleur
8ba651bb88
Merge pull request #17812 from frederic34/patch-24
...
fix warning
2021-06-04 08:57:10 +02:00
Frédéric FRANCE
ca66cdad01
debug intracomm report transport mode
2021-06-03 21:47:10 +02:00
Frédéric FRANCE
ee55a5568f
fix warning
2021-06-03 15:14:31 +02:00
Inovea Conseil
c534b7fcce
FIX delete object actionComm
2021-06-03 14:36:47 +02:00
ATM john
a7300d01b0
WIP - create validation method for common object
2021-06-03 09:49:07 +02:00
Frédéric FRANCE
ef032f9fa0
fix warning
2021-06-03 08:33:44 +02:00
Christian Foellmann
68579f9cda
fix html linebreak
2021-06-02 08:17:34 +02:00
Laurent Destailleur
0071d63fbb
Fix for ro-md language
2021-05-31 13:35:03 +02:00
Christian Foellmann
55d48077a3
ADD note to supplier order refusal
2021-05-31 10:45:34 +02:00
lmarcouiller
301d6ecd57
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-05-31 09:31:58 +02:00
lmarcouiller
ab64f467f5
add of a new param in selectGroupTicket
2021-05-31 09:31:38 +02:00
Laurent Destailleur
ea21e1dbfb
Fix color selection for ticket graph
2021-05-30 20:19:02 +02:00
Laurent Destailleur
d2bda7ad09
Set a maxlength on fields
2021-05-30 19:01:43 +02:00
Laurent Destailleur
4f6385338a
Fix option CAT_HIGH_QUALITY_IMAGES
2021-05-28 18:15:26 +02:00
Laurent Destailleur
81a94f5642
FIX option MAIN_GENERATE_SUPPLIER_PROPOSAL_WITH_PICTURE
2021-05-28 18:04:45 +02:00
Frédéric FRANCE
ca0654323f
fix warnings
2021-05-27 23:11:05 +02:00
Frédéric FRANCE
d0b8a80c7a
fix warning
2021-05-27 22:56:20 +02:00
Frédéric FRANCE
52d44bd75e
fix warnings
2021-05-27 22:28:59 +02:00
daraelmin
4095c69582
Fix #17743 newpayement source membersubscription is member
...
Fix #17743 newpayement source membersubscription is not valid anymore
@eldy I'm not sure, but the bug may still occure with external module referring to membersubscription instead of member.
2021-05-27 21:09:49 +02:00
Frédéric FRANCE
f1b32dce17
Update pdf_canelle.modules.php
2021-05-27 17:07:59 +02:00
Frédéric FRANCE
00d60aa65a
doxygen
2021-05-27 16:54:41 +02:00
Frédéric FRANCE
3ebe6eb014
fix bad setup of MAIN_USE_BACKGROUND_ON_PDF
2021-05-27 00:02:01 +02:00
Laurent Destailleur
8b1b2019f8
Update html.form.class.php
2021-05-26 17:24:27 +02:00
Laurent Destailleur
c3c0ad1c8d
Update html.form.class.php
2021-05-26 17:20:09 +02:00
Antonin MARCHAL
d11d1a2018
lint(stickler)
2021-05-26 17:10:12 +02:00
Antonin MARCHAL
8dd2af42df
fix(param) select_produits_fournisseur_list
2021-05-26 16:44:35 +02:00
Laurent Destailleur
f9d6438bae
Debug v14
2021-05-25 23:26:03 +02:00
Laurent Destailleur
a22a659d6e
Merge pull request #17716 from frederic34/patch-5
...
fix allowed preview
2021-05-25 22:53:28 +02:00
Laurent Destailleur
8576cf1b72
Fix combo when we must no hide value with key -1
2021-05-25 22:51:37 +02:00
Frédéric FRANCE
4c698ce798
Update html.form.class.php
2021-05-25 22:11:30 +02:00
Frédéric FRANCE
c76cf60e15
Update html.form.class.php
2021-05-25 22:09:58 +02:00
Laurent Destailleur
9b2fb74dca
Merge pull request #17635 from FHenry/fix_13_cyan_salesman_as_note
...
fix : hidden option MAIN_ADD_CREATOR_IN_NOTE should use dol_concatdesc rather than php concat oparator
2021-05-25 21:40:12 +02:00
Laurent Destailleur
bad90240bc
Update pdf_cyan.modules.php
2021-05-25 21:39:50 +02:00
Laurent Destailleur
c7a56e3f99
Merge pull request #17690 from Givriz/dev_1
...
Compatibility phpv8
2021-05-25 20:36:56 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier
...
NEW translate supplier order menus and button
2021-05-25 20:34:17 +02:00
Laurent Destailleur
80e77f597d
Merge pull request #17701 from FHenry/13.0_fix_formconfirm
...
fix: formconfim if type radio must be :checked to get correct value
2021-05-25 20:03:10 +02:00
Laurent Destailleur
673eb73d0a
Merge branch 'develop' into dev_1
2021-05-25 19:55:31 +02:00
Laurent Destailleur
67372ff7d4
Merge branch 'develop' into patch-1
2021-05-25 19:45:56 +02:00
Laurent Destailleur
b9de8561a9
Fix regression
2021-05-25 15:59:36 +02:00
Laurent Destailleur
97154f8267
Fix timezone into widgets
2021-05-25 00:29:32 +02:00
Laurent Destailleur
dd48c3ee9d
Remove deprecated __REFCLIENT__ (Replaced with __REF_CLIENT__)
2021-05-25 00:08:06 +02:00
Laurent Destailleur
bb64a25638
Fix CWE-269 - huntr - Fix set of email without edit user permission
2021-05-24 22:11:24 +02:00
Laurent Destailleur
31af74f852
FIX CWE-269 - huntr - Can download files of an agenda event
2021-05-24 20:07:04 +02:00
Laurent Destailleur
d4310f49c4
FIX CWE-79 - huntr - Fix option MAIN_ALLOW_SVG_FILES_AS_IMAGES
2021-05-24 19:46:19 +02:00
Laurent Destailleur
cdf3b7f9a8
Fix responsive
2021-05-24 19:05:25 +02:00
piernov
60176f7f5e
Fix add/del user to group modifies LDAP group
...
Adding or removing a user from a group modifies the user object on Dolibarr's side.
In LDAP however, members of a group are stored in the group itself.
Therefore group must be updated after adding/removing a user from it.
Update group in LDAP with new list of users at the end of USER_MODIFY trigger.
2021-05-24 18:01:27 +02:00
gmilad
89f150dd95
Fix #16100 Update utils.class.php
...
Fix #16100
End French Forum :
https://www.dolibarr.fr/forum/t/erreur-sauvegarde-dump-base-de-donnees/35009/7
2021-05-22 21:28:45 +02:00
Laurent Destailleur
a0418fc17d
FIX CWE-269 huntr - download of files of project
2021-05-21 18:53:09 +02:00
Laurent Destailleur
11fa523070
FIX CWE-269
2021-05-21 15:54:11 +02:00
Florian HENRY
609d405685
fix: formconfim if type radio must be :checked to get correct value
2021-05-21 15:38:03 +02:00
lvessiller
38bd595ebd
NEW translate supplier order menus and button
2021-05-21 14:18:46 +02:00
Givriz
0c5a934e10
Compatibility phpv8
2021-05-20 17:40:44 +02:00
Laurent Destailleur
5191a419d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-20 15:05:55 +02:00
Laurent Destailleur
45bc686f7f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/product/price.php
2021-05-20 15:05:30 +02:00
Laurent Destailleur
4c1e6afe2c
Merge pull request #17664 from Givriz/dev_1
...
Compatibility phpv8
2021-05-20 14:29:18 +02:00
Florian HENRY
62bc6e9e1f
on going
2021-05-20 13:15:32 +02:00
Laurent Destailleur
a3c28edfbb
Fix regenerate wrapper when rebuilding cache
2021-05-20 10:34:49 +02:00
Laurent Destailleur
dbd7292cd6
Replace doubleval into floatval
2021-05-20 09:22:55 +02:00
Laurent Destailleur
20c3ebeb51
Make SimplePOS deprecated
2021-05-19 19:46:46 +02:00
Laurent Destailleur
92ccf5982a
Fix responsive
2021-05-19 14:38:39 +02:00
Laurent Destailleur
8f5c898dae
CSS
2021-05-19 14:13:42 +02:00
Laurent Destailleur
173ef6e877
Look and feel v14
2021-05-19 14:04:01 +02:00
Laurent Destailleur
a8d36a3a55
Debug v14
2021-05-19 13:56:13 +02:00
Laurent Destailleur
026cc1b35a
Debug for smartphone
2021-05-19 13:21:09 +02:00
Laurent Destailleur
58ffee193f
Debug v14
2021-05-19 13:07:25 +02:00
Laurent Destailleur
75f7ab41f0
css
2021-05-19 12:13:21 +02:00
Laurent Destailleur
78cf2b59c8
Debug feature copy-paste on smarpthone
2021-05-19 11:47:58 +02:00
Givriz
1cf7d0cee7
Compatibility phpv8
2021-05-18 20:13:26 +02:00
Florian Mortgat
6cccd77508
FIX 13.0 - error message says MAIN_DISABLE_ALL_MAILS is set when it isn't + unhandled swiftmailer error (failed recipients due to RFC 2822 non-compliance)
2021-05-18 17:57:23 +02:00
Laurent Destailleur
271ba884db
css
2021-05-18 17:24:17 +02:00
Laurent Destailleur
a00ae6c918
css
2021-05-18 17:00:20 +02:00
Laurent Destailleur
c2cb055b0a
Fix look and feel v14
2021-05-18 14:00:29 +02:00
Laurent Destailleur
303d60a0bd
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-18 12:45:34 +02:00
Laurent Destailleur
0c4884bb2c
Fix sql error
2021-05-18 12:44:56 +02:00
Laurent Destailleur
5babd107a0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/replenish.php
2021-05-18 12:43:52 +02:00
Laurent Destailleur
495d2e79f4
Update html.form.class.php
2021-05-18 12:35:30 +02:00
Laurent Destailleur
b6dbe45242
Fix permissions on page to move position of file
2021-05-18 01:58:54 +02:00
Laurent Destailleur
ba0e95a4ff
FIX huntr CWE-79
2021-05-17 23:47:16 +02:00
Bastien Schils
1a38d075a6
html.form.class.php: Fixed SQL error (projects)
...
1. Strings should be quoted by single quotes
2. GROUP BY declaration must list all fields from SELECT statement
2021-05-17 18:35:50 +02:00
Laurent Destailleur
d888e4b3bf
Merge pull request #17385 from Givriz/dev_1
...
Compatibility phpv8
2021-05-17 16:29:49 +02:00
Florian HENRY
6f3d19b7b6
dol_concatdesc better than concat operator
2021-05-17 15:12:25 +02:00
Laurent Destailleur
bffdc8fa95
Merge pull request #17587 from FHenry/dev_fix_sale_top_menu_supplieronly
...
fix: when only supplier module is Active top menu should be displayed
2021-05-17 13:48:03 +02:00
Laurent Destailleur
4a488ad60a
Update eldy.lib.php
2021-05-17 13:47:48 +02:00
Florian HENRY
f95bd2f439
fixw that
2021-05-17 11:40:36 +02:00
Laurent Destailleur
1b25c4daa0
Fix phpcs
2021-05-17 11:29:51 +02:00
Laurent Destailleur
f25c57b1f6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 11:26:43 +02:00
Laurent Destailleur
6402ef9496
Fix colors
2021-05-17 11:26:31 +02:00
Laurent Destailleur
082ae2e627
Fix trans
2021-05-17 11:11:17 +02:00
Laurent Destailleur
d0c634a99c
Merge pull request #17489 from Hystepik/develop#1
...
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-17 10:23:21 +02:00
Florian HENRY
6ffbc2744e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_fix_sale_top_menu_supplieronly
2021-05-17 09:22:51 +02:00
Laurent Destailleur
8dc6241aee
Clean dead code
2021-05-17 08:58:02 +02:00
Laurent Destailleur
ac95302fa7
Clean comment
2021-05-17 08:48:02 +02:00
Laurent Destailleur
40106ff767
Update html.formmail.class.php
2021-05-17 08:35:29 +02:00
Laurent Destailleur
09a6946281
Update html.formmail.class.php
2021-05-17 08:34:58 +02:00
Laurent Destailleur
4768729c09
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
2021-05-17 07:57:32 +02:00
Laurent Destailleur
2f2ba933f8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/user/class/usergroup.class.php
2021-05-17 07:33:28 +02:00
Laurent Destailleur
b8b2928dd1
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-17 07:29:30 +02:00
Laurent Destailleur
5a15dbf545
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/user/class/usergroup.class.php
2021-05-17 07:29:19 +02:00
Laurent Destailleur
17b08cc22f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-17 07:27:13 +02:00
Laurent Destailleur
6bf66adff0
Fix remove some $_REQUEST
2021-05-17 07:27:02 +02:00
Laurent Destailleur
84ae2a2f91
Merge pull request #17624 from atm-maxime/patch-2
...
Update box_dolibarr_state_board.php
2021-05-17 07:15:50 +02:00
Laurent Destailleur
6a2afabcac
Merge pull request #17617 from piernov/11.0-fix-LDAPposixGroupId
...
Fix: properly set gid for Group LDAP synchro
2021-05-17 07:14:25 +02:00
Laurent Destailleur
88cdda2b8a
Merge pull request #17612 from frederic34/patch-3
...
avoid sql error with sql_mode=only_full_group_by
2021-05-17 07:12:11 +02:00
Laurent Destailleur
ad64b43e30
Update html.form.class.php
2021-05-17 07:11:41 +02:00
Laurent Destailleur
428ab1b67a
Merge pull request #17626 from atm-maxime/fix/ticket
...
Fix ticket when module societe not enabled
2021-05-17 06:59:32 +02:00
Laurent Destailleur
78b38f75a1
Minor fixes
2021-05-17 06:39:18 +02:00
Laurent Destailleur
d1ff2e3590
Add comment
2021-05-17 06:18:47 +02:00
Laurent Destailleur
9a8bd2c24b
Add missing field
...
Fix duplicate / in url
2021-05-17 06:13:26 +02:00
Maxime Kohlhaas
d3ff549b21
Fix ticket when module societe not enabled
2021-05-16 18:48:18 +02:00
Maxime Kohlhaas
d4aa0ae422
Update box_dolibarr_state_board.php
...
Global stats box is always enabled
2021-05-16 18:26:26 +02:00
Maxime Kohlhaas
7af0bda3a5
Update admin_extrafields_view.tpl.php
2021-05-16 11:33:07 +02:00
piernov
1cbe0e3f2d
Fix: properly set gid for Group LDAP synchro
...
Even if the gidNumber field was set in the configuration, a gid different from the Dolibarr's one was generated and stored into LDAP.
Now the gidNumber is properly set to Dolibarr's gid if gidNumber field is set in the LDAP module configuration.
2021-05-15 18:01:34 +02:00
Maxime Kohlhaas
db32f882e8
Fix use of DatePropal instead of Date
2021-05-15 07:45:04 +02:00
Frédéric FRANCE
cff0b69ce0
avoid sql error with sql_mode=only_full_group_by
...
SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht FROM llx_societe as s, llx_contrat as t, llx_contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (2) AND t.entity IN (1)[DB_ERROR_1140] In aggregated query without GROUP BY, expression #4 of SELECT list contains nonaggregated column 'dolibarrdev.t.rowid'; this is incompatible with sql_mode=only_full_group_by
2021-05-14 18:30:56 +02:00
Laurent Destailleur
f504cbcec4
Fix log
2021-05-12 19:18:51 +02:00
Laurent Destailleur
aa2d85276e
Debug v14
2021-05-12 18:38:22 +02:00
Florian HENRY
394d43543d
fix: when only supplier module is ON top menu should be displayed
2021-05-12 12:04:50 +02:00
Laurent Destailleur
a665ff5bda
Copy-Paste works also for hidden fields
2021-05-12 11:51:39 +02:00
Laurent Destailleur
cfded75d11
Debug v14
2021-05-12 09:27:04 +02:00
lmarcouiller
cd4583a841
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-12 09:08:19 +02:00
Laurent Destailleur
b8254186ce
Clean code
2021-05-12 09:07:36 +02:00
Laurent Destailleur
8971fde420
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 23:49:59 +02:00
Laurent Destailleur
f84817f0f6
FIX rss module on servers with allow_url_fopen=0
2021-05-11 23:49:33 +02:00
Frédéric FRANCE
a948fc4ed8
Update extrafields.class.php
2021-05-11 22:12:15 +02:00
stickler-ci
b8a3485c4c
Fixing style errors.
2021-05-11 19:33:23 +00:00
Laurent Destailleur
b5a43c8d1d
FIX #17502
2021-05-11 21:31:43 +02:00
kastoras
cd9ea9566b
Change parameter name to MAIN_FORCE_SHARING_ON_ANY_UPLOADED_FILE
2021-05-11 22:31:38 +03:00
kastoras
55caff1dd9
Merge remote-tracking branch 'origin/create_share_on_file_upload_with_other_setup' into develop
2021-05-11 22:23:12 +03:00
Laurent Destailleur
4ec763a436
Merge pull request #17497 from Hystepik/develop_v13#2
...
Fix #17491 : date extrafield filter works well now
2021-05-11 21:15:50 +02:00
Laurent Destailleur
91312f0411
Fix url for emailing unsubscribe
2021-05-11 21:13:52 +02:00
Laurent Destailleur
aa05788d62
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/compta/bank/class/account.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/security.lib.php
htdocs/core/modules/societe/mod_codeclient_elephant.php
htdocs/filefunc.inc.php
test/phpunit/CodingPhpTest.php
2021-05-11 20:34:46 +02:00
Laurent Destailleur
c0689b3884
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:43 +02:00
Laurent Destailleur
c3b5491805
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-11 20:18:36 +02:00
Laurent Destailleur
971d611eb6
Fix phpcs
2021-05-11 20:12:25 +02:00
Laurent Destailleur
780254bfd4
Merge pull request #17533 from daraelmin/daraelmin-mailing-subskey
...
New substitution key for member new form url in mailing
2021-05-11 19:41:12 +02:00
Laurent Destailleur
6591c3f50e
Merge pull request #17538 from AlexisLaurier/fix/restrictedAreaPaymentFournDelete
...
bug fix - deletion of invoice supplier payment
2021-05-11 19:27:05 +02:00
Laurent Destailleur
8336f56b40
Merge pull request #17539 from AlexisLaurier/fix/elephantClientCodeVerifDispoMultiEntity
...
add entity check on verif_dispo mod_codeclient_elephant
2021-05-11 19:13:17 +02:00
Frédéric FRANCE
e0cc6a4981
fix $db in class
2021-05-11 18:34:43 +02:00
Laurent Destailleur
eab3ac0615
Merge pull request #17558 from aspangaro/14b6
...
Fix Title supplier proposal
2021-05-11 18:18:35 +02:00
Laurent Destailleur
22b1d87973
Merge pull request #17555 from andreubisquerra/develop
...
NEW DOL_VALUE_PLACE tag in TakePOS template
2021-05-11 18:17:01 +02:00
Laurent Destailleur
d98e046fbd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-05-11 18:02:37 +02:00
Laurent Destailleur
56b0b5a1f1
Merge pull request #17575 from frederic34/patch-12
...
fix php8 warning
2021-05-11 18:00:29 +02:00
Laurent Destailleur
bea1b83e3f
Merge pull request #17570 from frederic34/patch-7
...
fix php8 warning
2021-05-11 17:58:59 +02:00
Laurent Destailleur
1c79b47147
Merge pull request #17574 from frederic34/patch-11
...
fix php8 warning
2021-05-11 17:58:17 +02:00
Laurent Destailleur
d8cbb735a3
Fix rtl language for pdf
2021-05-11 17:58:00 +02:00
Laurent Destailleur
c37ccc10b1
Debug v14
2021-05-11 14:50:04 +02:00
Pierre Payet
ff178667a3
add thirdparty customer code to substitutionarray
2021-05-11 12:33:35 +02:00
atm-lena
8fb474c687
Add Hook Extrafields Update - init extrafieldssdao
2021-05-11 11:35:54 +02:00
Frédéric FRANCE
eccfa40396
fix php8 warning
...
remove variables not used
2021-05-11 08:28:35 +02:00
Frédéric FRANCE
7e1ed07910
fix php8 warning
2021-05-11 08:26:03 +02:00
Frédéric FRANCE
9725c8f309
fix php8 warning
2021-05-11 08:05:30 +02:00
Alexandre SPANGARO
427221c8d3
Merge remote-tracking branch 'upstream/develop' into 14b6
2021-05-11 07:02:04 +02:00
Laurent Destailleur
d7a5e342ab
Optimize some widgets
2021-05-10 20:16:51 +02:00
Laurent Destailleur
6499270619
v14
2021-05-10 15:29:23 +02:00
Laurent Destailleur
2dd3148e3f
Fix look and feel v14
2021-05-10 15:24:07 +02:00
Laurent Destailleur
a2cd181435
FIX Debug reception module
2021-05-10 11:53:19 +02:00
Alexandre SPANGARO
100b0f297e
Fix Title supplier proposal contact card
2021-05-10 06:32:28 +02:00
Alexandre SPANGARO
c0062e2d41
Move title to v14 ergonomy
2021-05-10 06:26:58 +02:00
stickler-ci
3ee26fc881
Fixing style errors.
2021-05-09 21:37:58 +00:00
andreubisquerra
8aa8c14323
Fix
2021-05-09 22:53:05 +02:00
andreubisquerra
5a5811a716
NEW DOL_VALUE_PLACE tag in TakePOS template
...
Very important in restaurant orders
2021-05-09 22:37:00 +02:00
Laurent Destailleur
19bae333c9
Add option MAIN_SHOW_PASSWORD_INTO_LOG
2021-05-09 22:07:08 +02:00
Laurent Destailleur
1fb5b0f681
Fix rtl languages
2021-05-09 20:25:57 +02:00
Laurent Destailleur
3ad8827c8a
Clean code
2021-05-09 20:17:17 +02:00
Laurent Destailleur
8cc100012d
Fix vulnerabiity: External users can set a public note
2021-05-09 12:50:46 +02:00
Alexis LAURIER
e4a430f638
add entity check on verif_dispo mod_codeclient_elephant
2021-05-08 10:24:08 +02:00
Alexis LAURIER
d04c741a3b
add payment_fourn delete proper check into security.lib
2021-05-08 09:12:17 +02:00
stickler-ci
fc26e5eecf
Fixing style errors.
2021-05-07 20:42:53 +00:00
kastoras
1a385052f6
New Create share link on file upload
...
Create MAIN_CREATE_SHARE_ON_FILE_UPLOAD, when this set to 1 and a file is uploaded a shared link will be created
2021-05-07 23:39:14 +03:00
daraelmin
bfac47c84e
Too much underscore
2021-05-07 17:16:58 +02:00
daraelmin
a75d6e9050
Add tooltip
2021-05-07 17:14:33 +02:00
lmarcouiller
f054169036
revert of last push error of branch
2021-05-07 15:56:33 +02:00
lmarcouiller
0466704dc7
Fix #17477 : Sql error in invoices cards
2021-05-07 15:49:49 +02:00
lmarcouiller
bf64bde571
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-07 15:22:10 +02:00
lmarcouiller
b41a87ff70
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-07 12:06:46 +02:00
stickler-ci
d108496c67
Fixing style errors.
2021-05-07 07:47:49 +00:00
lmarcouiller
c39dbd81b3
Fix #17491 : Update of fix date extrafield filter
2021-05-07 09:47:15 +02:00
lmarcouiller
5dcdb06e91
Merge branch '13.0' of github.com:Dolibarr/dolibarr into develop_v13#2
2021-05-07 09:46:37 +02:00
lmarcouiller
f4291dc985
commit missing file
2021-05-07 09:20:18 +02:00
lmarcouiller
0f2ce8687d
Fix #17475 : Update of previous fix
2021-05-07 09:19:44 +02:00
Frédéric FRANCE
a56dc4ff65
fix mulitple module using completeTabsHead
...
complete $template['head'] in module and return 0 to not replace instead return $head and replace
2021-05-06 22:28:03 +02:00
Laurent Destailleur
6159321bed
NEW Show picto of module into the list of dictionaries
2021-05-06 18:31:36 +02:00
Laurent Destailleur
6b825cbc3b
Clean code
2021-05-06 18:06:19 +02:00
Laurent Destailleur
a22d3f8627
Merge pull request #17301 from andreubisquerra/master
...
NEW More permission in TakePOS (Can edit added line, can modify once order sent to kitchen)
2021-05-06 17:20:46 +02:00
Laurent Destailleur
d5c737ddb6
Update modTakePos.class.php
2021-05-06 17:19:28 +02:00
Laurent Destailleur
bd5e141d26
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/societe/consumption.php
2021-05-06 17:07:44 +02:00
Laurent Destailleur
3090c124f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-06 16:59:06 +02:00
Laurent Destailleur
8410f4a9c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/mails_templates.php
htdocs/societe/consumption.php
htdocs/user/class/user.class.php
2021-05-06 16:57:49 +02:00
Laurent Destailleur
f6f4968af6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/societe/consumption.php
2021-05-06 16:52:36 +02:00
Laurent Destailleur
7515de456f
Merge pull request #17495 from daraelmin/daraelmin-patch-2
...
New 5 substitutions keys "online payment link" in mailing
2021-05-06 16:36:10 +02:00
Laurent Destailleur
7a76dc4648
Merge pull request #17382 from DorianVabre/dev_EventOrganizer_payment
...
new: working on conference or booth object and event type #FoundationFunding
2021-05-06 16:31:30 +02:00
Laurent Destailleur
0867be4af5
Merge pull request #17513 from dolibit-ut/patch-320
...
Update modules_member.class.php
2021-05-06 16:27:45 +02:00
lmarcouiller
7d649dd90e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-05-06 16:26:30 +02:00
Laurent Destailleur
864c2a0bf7
Merge pull request #17506 from atm-gauthier/FIX_column_adding_management_in_dom_added_with_ajax_case
...
FIX : if dom is added with ajax, selector needs to keep working
2021-05-06 16:24:26 +02:00
Laurent Destailleur
5a927702c0
Merge pull request #17500 from fmarcet/develop
...
NEW: Add import on BOM
2021-05-06 16:21:09 +02:00
Laurent Destailleur
9e057332f0
Merge pull request #17486 from NextGestion/dolibarr_partnership
...
Dolibarr partnership
2021-05-06 16:11:13 +02:00
UT from dolibit
9cd78e6ecf
Update modules_member.class.php
2021-05-06 16:00:49 +02:00
Laurent Destailleur
a0f85044fc
Merge pull request #17510 from Hystepik/develo#2
...
Fix #17501 : Undownloable attached file
2021-05-06 16:00:20 +02:00
Laurent Destailleur
21ce99338b
Merge pull request #17504 from FHenry/13.0
...
fix missing token
2021-05-06 15:57:45 +02:00
lmarcouiller
d55309c847
fix rename file
2021-05-06 09:46:54 +02:00
Laurent Destailleur
19f78b2e8f
More compact gui
2021-05-05 19:13:40 +02:00
Gauthier PC portable 024
9108651a7a
FIX : if dom is added with ajax, selector need to keep working
2021-05-05 17:25:12 +02:00
Florian HENRY
adc8620506
fix: allow webdavs link type
2021-05-05 17:14:58 +02:00
Florian HENRY
e62c6be54c
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-05-05 17:06:03 +02:00
Florian HENRY
7857da4db7
fix missing token
2021-05-05 17:05:51 +02:00
lmarcouiller
6589bab20a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-05-05 16:48:28 +02:00
lmarcouiller
ed59a8851f
Fix #17501 : Undownloable attached file
2021-05-05 16:48:04 +02:00
Ferran Marcet
6f66efacb8
New: Add import on BOM
2021-05-05 13:47:43 +02:00
Marc de Lima Lucio
139ae3db00
FIX: pgsql: prevent 'WHERE 1'
2021-05-05 11:49:11 +02:00
stickler-ci
95be7e8a63
Fixing style errors.
2021-05-05 09:29:52 +00:00
lmarcouiller
b739e7ba22
Fix #17491 : date extrafield filter works well now
2021-05-05 11:26:15 +02:00
Laurent Destailleur
f1929eb106
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-05 00:16:27 +02:00
Laurent Destailleur
3807804acc
Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE
2021-05-05 00:15:52 +02:00
stickler-ci
fb3c8e698e
Fixing style errors.
2021-05-04 20:59:32 +00:00
daraelmin
b04dfcadc7
Add function to get html online payment link
2021-05-04 21:55:19 +02:00
Laurent Destailleur
bf52b54db6
Add date in error message
2021-05-04 19:43:33 +02:00
lmarcouiller
457a96bc34
Fix #17475 : Add of List-Unsubscribe in mass emailing
2021-05-04 15:11:30 +02:00
Laurent Destailleur
526235d020
Fix substitution of mix html/nohtml
...
Fix send email reminder for past due date of invoices
More PHPUnit test
2021-05-04 13:33:18 +02:00
NextGestion
6f85cab6c4
Merge https://github.com/Dolibarr/dolibarr into dolibarr_partnership
2021-05-04 10:55:19 +01:00
daraelmin
729a5677ad
Group tooltip by key type
2021-05-04 01:53:46 +02:00
daraelmin
9ab7f4ec01
Add tooltip for new substitution keys
2021-05-04 01:41:32 +02:00
Laurent Destailleur
1d0c0a8d2a
Fix phpcs
2021-05-04 00:35:36 +02:00
Laurent Destailleur
bb64c330f6
Merge pull request #17441 from fappels/13_tokenonactiondelete
...
FIX missing token on dolGetButtonAction for action delete
2021-05-04 00:21:55 +02:00
Laurent Destailleur
b2901bfae0
Make code simpler
2021-05-04 00:15:06 +02:00
Laurent Destailleur
16f1651d4e
Add missing action events in trigger
2021-05-04 00:04:44 +02:00
Laurent Destailleur
6e32efdb40
Fix phpcs
2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9
Disable empty tabs
2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate
...
New Add option for doctemplate
2021-05-03 19:45:40 +02:00
Laurent Destailleur
9973085613
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/propal/card.php
htdocs/compta/bank/releve.php
htdocs/compta/paiement/rapport.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/reception/card.php
htdocs/societe/societecontact.php
2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3
Enhance error management
2021-05-03 19:25:16 +02:00
Laurent Destailleur
cbc481dc60
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/adherents/list.php
htdocs/adherents/type.php
htdocs/core/lib/company.lib.php
2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/boxes/box_produits_alerte_stock.php
2021-05-03 18:57:52 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php
2021-05-03 16:16:44 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria
...
NEW rise code tries in digeteria customer and supplier accountant code
2021-05-03 15:57:46 +02:00
Laurent Destailleur
7b706d6fe5
Fix phpunit for crop of image
2021-05-03 15:56:56 +02:00
Laurent Destailleur
5d870d5802
FIx #17447
2021-05-03 15:36:34 +02:00
Laurent Destailleur
1c95e2b7c7
FIX #17453
2021-05-03 14:58:29 +02:00
Laurent Destailleur
c6a9117a00
Graph color
2021-05-03 14:03:50 +02:00
Laurent Destailleur
b22f2dd2c8
Merge pull request #17415 from Hystepik/develo#2
...
Close #17271 : Replacement of 2 graphes in /compta/index.php
2021-05-03 13:56:44 +02:00
Laurent Destailleur
a806a18455
Reduce sql
2021-05-03 13:35:10 +02:00
Laurent Destailleur
39e27b6f38
Minor perf enhancement
2021-05-03 12:32:31 +02:00
Laurent Destailleur
2a47128e2d
Code comment
2021-05-03 11:00:41 +02:00
Laurent Destailleur
2bef447229
Clean code
2021-05-02 16:24:52 +02:00
Laurent Destailleur
efda17657d
Fix conversion in webp
2021-05-02 15:29:52 +02:00
Laurent Destailleur
39f7d0bed8
Fix conversion of images
2021-05-02 15:15:27 +02:00
Laurent Destailleur
92c1022b8e
Fix duplicate in webp
2021-05-02 14:49:07 +02:00
Laurent Destailleur
8176898430
Fix lang
2021-05-02 14:31:03 +02:00
Laurent Destailleur
a54e60d345
Look and feel v14
2021-05-02 13:13:55 +02:00
Laurent Destailleur
3edb929f9e
Debug v14
2021-05-02 12:43:28 +02:00
Laurent Destailleur
24a58b1956
Removed not used permission
2021-05-02 11:21:01 +02:00
Laurent Destailleur
4e7e6048de
Debug generation of webp
2021-05-01 15:42:49 +02:00
Laurent Destailleur
99d655b983
Debug generation of webp
2021-05-01 15:38:58 +02:00
Laurent Destailleur
575d335374
Debug generation of webp
2021-05-01 15:12:30 +02:00
Laurent Destailleur
0ee1d4b322
Reduce log verbosity
2021-05-01 13:22:01 +02:00
Laurent Destailleur
69511e2706
Debug
2021-04-30 16:15:35 +02:00
lvessiller
ab89fe73c2
NEW rise code tries in digeteria customer and supplier accountant code
2021-04-30 16:08:46 +02:00
Laurent Destailleur
e99355a0c2
Clean html
2021-04-30 15:22:17 +02:00
ATM john
6e4962bb39
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0_fix_showInputField_checkbox_selection
2021-04-30 12:22:31 +02:00
ATM john
6c1e0919c8
Fix checkbox multiselect pre-selected value from get/post
2021-04-30 12:20:43 +02:00
Laurent Destailleur
67fd5477c9
Merge pull request #17427 from Hystepik/develop#4
...
New Module Knowledge Management
2021-04-30 12:12:15 +02:00
Francis Appels
773b16928d
only if no token
2021-04-30 11:15:01 +02:00
Laurent Destailleur
5a1f2db024
Clean sql
2021-04-30 10:57:21 +02:00
Francis Appels
05a96b3ee2
FIX missing token on dolGetButtonAction for action delete
2021-04-30 10:46:05 +02:00
stickler-ci
81b964db45
Fixing style errors.
2021-04-30 08:12:24 +00:00
atm-lena
5e98d99321
FIX SQL Error show_contacts : socialnetworks
2021-04-30 10:04:21 +02:00
Laurent Destailleur
e7e2953a9e
Look and feel
2021-04-29 15:49:44 +02:00
Laurent Destailleur
e3767557d8
Fix phpcs
2021-04-29 12:33:49 +02:00
Laurent Destailleur
655056ed31
Debug v14
2021-04-29 12:10:55 +02:00
Florian HENRY
a7b093ed81
FIX: Espadon PDF shippment model with long public note now wroking
2021-04-29 11:34:09 +02:00
lmarcouiller
d4fb9c7c47
knowledgemanager finished
2021-04-29 10:49:56 +02:00
Dorian Vabre
cb21131259
Merge branch 'develop' into dev_EventOrganizer_payment
2021-04-29 10:31:43 +02:00
Laurent Destailleur
a2245bd7db
Fix add of box
2021-04-29 10:13:43 +02:00
Laurent Destailleur
de8e291c7e
Debug v14
2021-04-29 10:01:10 +02:00
lmarcouiller
6da32015f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4
2021-04-29 09:45:30 +02:00
lmarcouiller
799d1de830
Update incoice.lib.php and index.php match eldy's requests
2021-04-29 09:31:49 +02:00
Anthony Berton
bb5a11ff75
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into pr/bb2a/17185
2021-04-29 00:06:35 +02:00
Anthony Berton
c1e6109c4b
Update
2021-04-29 00:03:16 +02:00
Laurent Destailleur
6f1f26096e
Debug partnership module
2021-04-28 23:25:26 +02:00
Anthony Berton
5d17e26738
add_pdf_template_and_read_if_module_activate
2021-04-28 23:25:03 +02:00
Laurent Destailleur
64374f46da
Debug v14
2021-04-28 23:01:20 +02:00
Laurent Destailleur
846bab38da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-28 22:45:10 +02:00
Laurent Destailleur
b1d858eb26
Fix translation of new modules
2021-04-28 22:44:57 +02:00
Laurent Destailleur
9934e28c2a
Merge pull request #17423 from FHenry/dev_new_notif_trigger
...
Add ORDER_CREATE trigger for notificiation
2021-04-28 21:39:45 +02:00
Laurent Destailleur
95ecb95ff1
FIX dol_print_date for %a and %b with some timezone
2021-04-28 20:47:28 +02:00
Laurent Destailleur
18e911a636
FIX dol_print_date for %a and %b with some Timezone
2021-04-28 20:44:22 +02:00
Laurent Destailleur
2dc597f5d0
Make setup easier to understand
2021-04-28 18:04:00 +02:00
Florian HENRY
8dd331d461
Add ORDER CREATE trigger for notificiation
2021-04-28 17:55:03 +02:00
Laurent Destailleur
75a8dc28ea
Merge pull request #17261 from aspangaro/14a39
...
Maxi debug of societe/product per entity
2021-04-28 17:06:45 +02:00
Laurent Destailleur
6b74a656ed
Merge pull request #17412 from daraelmin/daraelmin-patch-box-adhstatusconst
...
Clean code (use adh status const in boxes)
2021-04-28 16:48:31 +02:00
Laurent Destailleur
9f56ce6c53
Merge pull request #17405 from Hystepik/develop#1
...
Fix #17219 : complement of PR 17161
2021-04-28 15:48:38 +02:00
lmarcouiller
d753ef6393
edit of modKnowledgeManagement.class
2021-04-28 15:28:00 +02:00
lmarcouiller
97043ca665
New module KnowledgeManagement
2021-04-28 14:57:49 +02:00
Laurent Destailleur
e50494152d
Fix label
2021-04-28 11:22:45 +02:00
lmarcouiller
be22d43c60
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develo#2
2021-04-28 09:24:18 +02:00
lmarcouiller
7782e849e2
changes to implement eldy's advices
2021-04-28 09:22:10 +02:00
lmarcouiller
c1069c5f16
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-28 09:03:36 +02:00
daraelmin
50a5dd7ff3
Use adh const
2021-04-27 23:28:49 +02:00
daraelmin
e7f1170736
Use adherent status const
2021-04-27 23:22:29 +02:00
Laurent Destailleur
cb72a010cd
FIX notifications for expense report has disappeared.
2021-04-27 22:14:19 +02:00
Laurent Destailleur
0a871546ee
Merge pull request #17379 from atm-adrien/FIX_add_function_price2num_to_productAlertStock_box_12.0
...
FIX : Add function price2num for rounding values in productAlertStock…
2021-04-27 18:45:26 +02:00
lmarcouiller
52bf0f0359
Close #17271 : Replament of 2 graph in compta/index.php
2021-04-27 16:02:46 +02:00
kamel
3a673c9210
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_00007
2021-04-27 12:29:10 +02:00
lmarcouiller
8896e7c0d5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-04-27 11:18:33 +02:00
lmarcouiller
758ba67adc
Fix #17219 : new complement of PR 17161
2021-04-27 10:50:45 +02:00
Adrien Raze
e8c2085abd
FIX : Change parameters MF to MS for price2num() function
2021-04-27 09:24:22 +02:00
Laurent Destailleur
4b204301a9
Enhance logs
2021-04-27 03:25:49 +02:00
Laurent Destailleur
3e013ebad0
Fix mass action delete of cron jobs
2021-04-27 03:16:11 +02:00
Laurent Destailleur
5bb2531364
Enhance ticket module
2021-04-27 02:52:24 +02:00
Laurent Destailleur
d6cdfcdd8c
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
htdocs/public/members/new.php
2021-04-27 02:07:48 +02:00
Laurent Destailleur
48a50f3b10
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement/card.php
htdocs/compta/paiement/class/paiement.class.php
2021-04-27 01:58:19 +02:00
Laurent Destailleur
e82965090f
Merge pull request #17395 from Robin-Yann/13-fix-combo-prospect
...
13 fix combo prospect
2021-04-27 01:18:57 +02:00
Anthony Berton
6353084777
init
2021-04-27 00:22:39 +02:00
Laurent Destailleur
d1fd26356f
Merge pull request #17377 from gmilad/gmilad-scayt-210423
...
NEW : Update doleditor.class.php for easily activate SCAYT
2021-04-26 23:38:23 +02:00
Laurent Destailleur
062dc28850
Merge pull request #17388 from aspangaro/14a30
...
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-26 21:18:48 +02:00
Laurent Destailleur
f66c506011
Merge pull request #17381 from atm-lena/12.0_FormAttachOptions_AddHookParameters_Options
...
Add parameter "option" to hook formattachOptions
2021-04-26 21:00:12 +02:00
Laurent Destailleur
c849ce79e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-26 19:21:38 +02:00
Laurent Destailleur
d138e7410b
Clean code
2021-04-26 19:12:23 +02:00
kamel
9c46b234cf
FIX Supplier invoices (deposit, multicurency in lines)
2021-04-26 17:43:27 +02:00
lmarcouiller
080bd90c93
Fix #17219 : complement of PR 17161
2021-04-26 16:15:09 +02:00
stickler-ci
1a4e1b1ae9
Fixing style errors.
2021-04-26 13:46:37 +00:00
Laurent Destailleur
14baec95dc
Clean code
2021-04-26 15:44:24 +02:00
Alexandre SPANGARO
d95be3e08b
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-26 13:53:16 +02:00
Laurent Destailleur
87393cee98
Clean code
2021-04-26 11:59:47 +02:00
Laurent Destailleur
c9d6bc70e8
Clean code
2021-04-26 10:22:28 +02:00
stickler-ci
ebd3b00016
Fixing style errors.
2021-04-26 07:24:00 +00:00
Robin-Yann
836b811449
Merge branch 'develop' into 13-fix-combo-prospect
2021-04-26 09:21:32 +02:00
Robin
04c97d2695
FIX combo Prospect / Customers / Supplier in society list
2021-04-26 09:05:47 +02:00
Laurent Destailleur
c3d3b79315
Fix test on Local url
2021-04-25 22:11:57 +02:00
Laurent Destailleur
fd2d317b4a
Fix #yogosha5881
2021-04-25 15:55:36 +02:00
Laurent Destailleur
2fd2c67139
Clean edit of user card
2021-04-25 15:21:31 +02:00
Laurent Destailleur
9f03054fc4
Fix #yogosha5877
2021-04-24 20:52:48 +02:00
Laurent Destailleur
d0cc64479d
Fix protect sql
2021-04-24 20:18:11 +02:00
Alexandre SPANGARO
f60df8964a
NEW: Add option SUPPLIER_PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD
2021-04-24 08:05:00 +02:00
Givriz
a451fee68f
Compatibility phpv8
2021-04-23 18:01:11 +02:00
atm-lena
3d3fb17da3
Add parameter "option" to hook formattachOptions
2021-04-23 15:41:43 +02:00
Adrien Raze
c5775cc902
FIX : Add parameter to function price2num()
2021-04-23 12:31:45 +02:00
Adrien Raze
2ab17c44e9
FIX : Add function price2num for rounding values in productAlertStock box
2021-04-23 11:11:47 +02:00
Dorian Vabre
b441c600bb
fixing error introduced in a previous commit
2021-04-23 10:32:28 +02:00
gmilad
b9c33fc8b6
Update doleditor.class.php for
...
(English below)
Bonjour,
Voici une proposition d'ajout de fonctionnalité afin de pouvoir activer facilement le plugins SpellCheckAsYouType (SCAYT) de CKEditor, pour l'historique voir ce fils de discutions sur le forum Francophone de Dolibarr :
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Amicalement,
Gaëtan.
(English below)
Hello,
Here is a proposal to add functionality to easily activate the SpellCheckAsYouType (SCAYT) plugins of CKEditor, for the history see this thread on the Dolibarr forum:
https://www.dolibarr.fr/forum/t/wysiwyg/28874/11?u=gmilad
Kind regards,
Gaëtan.
2021-04-23 00:45:07 +02:00
Dorian Vabre
4c57a6c207
wip on mail, sending ok but no content
2021-04-20 17:28:18 +02:00
Dorian Vabre
a500d83c0b
linked invoice and attendee
2021-04-20 16:09:22 +02:00
Laurent Destailleur
1bd2bd3237
Fix php8 warning
2021-04-20 12:46:41 +02:00
Laurent Destailleur
14f009f550
Fix CURLOPT_CONNECT_TO
2021-04-20 12:19:46 +02:00
Laurent Destailleur
f1f63cd4e2
Enhance detection of update available
2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb
Add the setup page of module accounting to not search where is setup
2021-04-20 11:40:43 +02:00
Alexandre SPANGARO
d27030df3f
Merge remote-tracking branch 'upstream/develop' into 14a39
2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00
Revert "Split mod fournisseur"
...
This reverts commit 78dbf4f7ff
2021-04-20 04:42:51 +02:00
Laurent Destailleur
3aee28fb1b
Merge pull request #17263 from atm-adrien/NEW_add_userGroup_for_user_exports_develop
...
NEW : Add possibility to exports userGroups fields on user exports
2021-04-19 21:58:38 +02:00
Laurent Destailleur
18d87ae575
Merge pull request #17255 from Givriz/dev_1
...
Compatibility phpv8
2021-04-19 21:44:25 +02:00
Laurent Destailleur
e71e5d533d
Fix HTML5
2021-04-19 21:30:25 +02:00
Laurent Destailleur
c966914f67
Merge branch 'develop' into new/check_update_for_module
2021-04-19 21:26:01 +02:00
Laurent Destailleur
46ea1084f5
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/mailing/cibles.php
htdocs/core/extrafieldsinexport.inc.php
htdocs/product/stock/card.php
2021-04-19 20:59:10 +02:00
Laurent Destailleur
3df79dd3c8
Avoid error on PHP 5.6
2021-04-19 20:49:31 +02:00
NextGestion
7cab4dd19d
Manage partnership for members & code optimisation
2021-04-19 15:17:57 +01:00
Laurent Destailleur
a8187af8ef
Use MAIN_SECURITY_ANTI_SSRF_SERVER_IP as whitelist for local IP.
2021-04-19 15:16:00 +02:00
Laurent Destailleur
08ded970e2
NEW Add option MAIN_SECURITY_ANTI_SSRF_SERVER_IP
2021-04-19 15:01:36 +02:00
NextGestion
263e110ca3
Enhance module Member
2021-04-19 13:19:32 +01:00
Laurent Destailleur
0537fdd1c6
Add local ip into excluded IP for external URL download.
...
Fix #yogosha5861
2021-04-19 13:52:12 +02:00
Laurent Destailleur
61df76dd9a
Fix pb in date format %a %b when using a negative timezone
...
Enhance date management and unit tests.
2021-04-19 12:48:08 +02:00
Laurent Destailleur
23b11491d2
Can filter also on payment mode
2021-04-19 11:11:01 +02:00
Laurent Destailleur
ad84af1d0a
Fix id cron task
2021-04-19 10:39:16 +02:00
Laurent Destailleur
634c8c9fa4
Add a schedule dtask to send reminder by email on date due.
2021-04-19 10:38:52 +02:00
ATM john
d25c544a7a
Merge branch 'new/check_update_for_module' of github.com:atm-john/dolibarr into new/check_update_for_module
2021-04-18 22:50:43 +02:00
ATM john
b337422576
Remove ctrl+v
2021-04-18 22:50:34 +02:00
stickler-ci
8ab117a62f
Fixing style errors.
2021-04-18 20:40:34 +00:00
ATM john
781756913b
Fix code Stickler
2021-04-18 22:38:18 +02:00
ATM john
da11ac42ac
New check update for modules
2021-04-18 22:13:37 +02:00
ATM john
7794927a64
New check update for modules
2021-04-18 20:12:24 +02:00
Laurent Destailleur
cad7ea0b92
css
2021-04-18 15:07:22 +02:00
Laurent Destailleur
3502c4c269
Debug sitemap generation
2021-04-18 13:45:46 +02:00
NextGestion
973ea370e8
Fixing errors
2021-04-17 13:38:23 +01:00
NextGestion
5a8742b3eb
Cancel Partnership For Expired Members & Warning of partnership if Dolibarr backlink not found on partner website
2021-04-17 13:25:28 +01:00
NextGestion
87bcb212df
Merge branch 'develop' into dolibarr_partnership
2021-04-17 13:51:21 +01:00
Laurent Destailleur
4abf7d1c91
Better error management for SMTPS sending method
2021-04-17 13:53:52 +02:00
Alexandre SPANGARO
78dbf4f7ff
Split mod fournisseur
2021-04-17 07:49:19 +02:00
Laurent Destailleur
c929c05dc5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-17 03:33:31 +02:00
Laurent Destailleur
0d8a354934
Set default length of password to 12 car.
...
FIX #yogosha5855
2021-04-17 03:11:58 +02:00
andreubisquerra
83da58b85f
Fix travis
2021-04-17 01:17:48 +02:00
jove@bisquerra.com
712e1c4e7c
NEW Edit sales lines rights in TakePOS
2021-04-17 01:06:30 +02:00
Laurent Destailleur
70abc04bf5
Merge pull request #17103 from Givriz/dev
...
Fix compatibility phpv8
2021-04-16 20:51:00 +02:00
Laurent Destailleur
1a3e9cae68
Comment
2021-04-16 20:44:30 +02:00
Laurent Destailleur
c841282a25
Merge pull request #17283 from Givriz/dev_2
...
Compatibility phpv8 #2
2021-04-16 20:37:31 +02:00
Laurent Destailleur
a31efd248f
Merge pull request #17280 from andreubisquerra/develop
...
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-16 20:29:58 +02:00
Laurent Destailleur
9eaf836c8e
Merge pull request #17281 from altairisfr/warehouses_in_project
...
Warehouses in project
2021-04-16 20:29:21 +02:00
Givriz
86bfcd9510
Easy way to use conf->global
2021-04-16 17:10:11 +02:00
Laurent Magnin
4aab805b4e
FIX:Add ticket substition template
2021-04-16 12:39:39 +02:00
NextGestion
0d4a1d061a
Merge branch 'develop' into dolibarr_partnership
2021-04-16 11:01:08 +01:00
NextGestion
9304b3c474
Manage mass action "Send email" for Partnership module
2021-04-16 09:54:11 +01:00
Florian HENRY
99b7deba14
Merge branch '13.0' of github.com:Dolibarr/dolibarr into fix_13_toomanytestmenu
2021-04-16 10:37:50 +02:00
Florian HENRY
0cd567f256
fix double test
2021-04-16 10:37:42 +02:00
Laurent Destailleur
38f54d0582
FIX Missing extrafields into export of agenda record
2021-04-16 10:26:35 +02:00
Laurent Destailleur
ceb50d90ca
NEW Add a page about security setup advices
...
NEW Add a page about performance setup advices
2021-04-15 19:25:37 +02:00
Laurent Destailleur
db5dcd3e52
NEW When a doc file is shared, link is visible from main page of doc.
2021-04-15 17:56:55 +02:00
Laurent Destailleur
f1d55d38ba
Show link to shared file if it exists.
2021-04-15 17:09:15 +02:00
Laurent Destailleur
707efa7765
Debug v14
2021-04-15 15:54:54 +02:00
Laurent Destailleur
bf547cf20d
Debug v14
2021-04-15 14:33:48 +02:00
Laurent Destailleur
7e4f7f7200
Nicer page of widget setup
2021-04-15 13:31:40 +02:00
Laurent Destailleur
09365c29c9
Nicer page of widget setup
2021-04-15 13:22:03 +02:00
altairis-noe
3fe0eb54c7
association of warehouses to projects
2021-04-15 09:59:08 +02:00
andreubisquerra
662caadd18
Add DOL_PRINT_OBJECT_LINES_WITH_NOTES tag in TakePOS
2021-04-14 23:32:08 +02:00
Givriz
47cdfee1d2
Compatibility pvpv8
2021-04-14 22:03:04 +02:00
Givriz
598156de04
Update modDataPolicy.class.php
...
There was useless condition
2021-04-14 17:58:46 +02:00
Laurent Destailleur
b298420ac5
Fix bad test
2021-04-14 15:12:40 +02:00
Laurent Destailleur
a68a5b0c04
Look and feel v14
2021-04-14 15:11:26 +02:00
NextGestion
4e45011e45
Manage Partnership for third-party
2021-04-14 13:59:38 +01:00
stickler-ci
bcab8d5164
Fixing style errors.
2021-04-14 07:49:18 +00:00
Adrien Raze
c83819bd90
NEW : Add possibility to exports userGroups fields on user exports
2021-04-14 09:44:01 +02:00
Alexandre SPANGARO
2f31720896
Maxi debug of societe/product per entity
2021-04-14 04:45:17 +02:00
Laurent Destailleur
033a243372
Merge pull request #17166 from altairisfr/product_masks
...
Product masks
2021-04-13 23:06:09 +02:00
Laurent Destailleur
7f62b6c49b
Look and feel v14
2021-04-13 22:58:37 +02:00
Laurent Destailleur
25a6aa1388
NEW Add data-eec=1 for EEC countries on select for js interaction
2021-04-13 22:50:50 +02:00
Laurent Destailleur
161baa672a
Fix phpcs
2021-04-13 21:11:02 +02:00
Laurent Destailleur
358bb87ae2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/payments.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/projet/card.php
htdocs/public/payment/newpayment.php
htdocs/societe/list.php
htdocs/ticket/document.php
2021-04-13 20:19:05 +02:00
Laurent Destailleur
f54fd1063b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-13 19:39:08 +02:00
Laurent Destailleur
c93f88e47a
Debug mass action after regression on close on proposal
2021-04-13 19:38:55 +02:00
Laurent Destailleur
192fcb89d2
Merge pull request #17097 from NextGestion/dolibarr_partnership
...
Create Partnership Module
2021-04-13 16:33:54 +02:00
Givriz
bc78b87020
pvpv8 continuous integration
2021-04-13 16:32:19 +02:00
Laurent Destailleur
d09be1f86f
Do not make new twice
2021-04-13 16:18:18 +02:00
Laurent Destailleur
adbebac0fc
Merge pull request #17243 from frederic34/patch-3
...
fix MAIN_ADD_PDF_BACKGROUND
2021-04-13 15:41:20 +02:00
Robin
0839ee25cd
FIX missing parameter in select for POP
...
All options can be modified for selector in pop
2021-04-13 10:44:14 +02:00
Frédéric FRANCE
d007e75a8e
Update pdf_eratosthene.modules.php
2021-04-13 09:55:04 +02:00
Frédéric FRANCE
8085f10995
Update pdf_einstein.modules.php
2021-04-13 09:53:51 +02:00
Frédéric FRANCE
8953c0ac3a
Update pdf_cyan.modules.php
2021-04-13 09:49:30 +02:00
Frédéric FRANCE
ee4f846eb9
Update pdf_azur.modules.php
2021-04-13 09:49:03 +02:00
Frédéric FRANCE
fcca5d7d5c
Update pdf_sponge.modules.php
2021-04-13 09:47:15 +02:00
Frédéric FRANCE
9ce6d841cc
Update pdf_crabe.modules.php
2021-04-13 09:40:16 +02:00
Alexandre SPANGARO
44133166de
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-12 21:35:03 +02:00
Laurent Destailleur
a7a95cff03
Fix payment link for renewal with a unique secure key
2021-04-12 16:41:40 +02:00
Damien BENOIT
9abc7a5b0d
Update modDataPolicy.class.php
2021-04-12 16:16:48 +02:00
Laurent Destailleur
3d681d96c4
Merge pull request #17205 from DorianVabre/dev_EventOrganizer
...
new: working on conference or booth object and event type #FoundationFunding
2021-04-12 16:06:13 +02:00
Givriz
7a54e5d346
Using empty instead of isset
...
I used empty instead of isset, and I fixed some problems of my previous pull request
2021-04-12 16:03:56 +02:00
Laurent Destailleur
8a62d97b89
Remove one thousand of useless files
2021-04-12 15:57:16 +02:00
altairis-noe
ab39cfdf09
oops, better if we test the right const
2021-04-12 14:32:05 +02:00
Laurent Destailleur
8fa943edc3
Fix select field in multiselect of languages
2021-04-12 14:26:09 +02:00
altairis-noe
beecc6f935
Merge branch 'product_masks' of github.com:altairisfr/dolibarr into product_masks
2021-04-12 14:13:37 +02:00
altairis-noe
a61c1f8807
checkboxes for custom masks
2021-04-12 14:01:36 +02:00
Laurent Destailleur
5dd0d05c4e
Test to disable text in menu
2021-04-12 12:07:11 +02:00
Laurent Destailleur
86328462c7
Enhance getURLContent
2021-04-12 11:20:44 +02:00
Alexandre SPANGARO
8d72448f43
Add right supplier_order
2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
87cc1b2601
Add right supplier_invoice
2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
2a1a22763d
Work on split module fournisseur
2021-04-12 06:51:00 +02:00
Alexandre SPANGARO
f749111148
Work on split module fournisseur
2021-04-12 06:27:46 +02:00
Alexandre SPANGARO
ab35b6b4f2
Work on split module fournisseur
2021-04-12 06:21:25 +02:00
Alexandre SPANGARO
77d751b03e
Work on split module fournisseur
2021-04-12 05:41:37 +02:00
Alexandre SPANGARO
80c6458faa
Work on split module fournisseur
2021-04-11 22:25:45 +02:00
Alexandre SPANGARO
ab5599a672
Merge remote-tracking branch 'upstream/develop' into 14a36
2021-04-11 20:53:30 +02:00
Laurent Destailleur
f437e70ac6
Selection of theme is easier
2021-04-11 16:11:05 +02:00
Alexandre SPANGARO
ce7c5a0c7b
Work on split module fournisseur
2021-04-11 04:24:21 +02:00
Laurent Destailleur
ac64938266
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 15:31:39 +02:00
Laurent Destailleur
8526ca5304
Merge pull request #17121 from 0x00FE/add-friday-holiday
...
NEW Add support for Friday as a holiday
2021-04-10 15:30:57 +02:00
Laurent Destailleur
be800e07f2
Use urlencode even on security key
2021-04-10 15:27:44 +02:00
Laurent Destailleur
35a64e08bf
Fix link
2021-04-10 14:12:51 +02:00
Laurent Destailleur
cb57546d99
NEW Can hide columns "time consumed" on timesheet per week.
2021-04-10 13:53:23 +02:00
Laurent Destailleur
1444920f57
Merge pull request #17204 from Hystepik/develop#1
...
Close #17193 : Move button added with PR 17161
2021-04-10 13:02:21 +02:00
Laurent Destailleur
6241ba559b
Trans
2021-04-10 12:44:41 +02:00
Laurent Destailleur
11330fd6c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:42:55 +02:00
Laurent Destailleur
ce6f8eebf5
Close #17206 Add comment on type of constants
2021-04-10 12:42:43 +02:00
Laurent Destailleur
b6e4bdbc6c
Merge pull request #17210 from Csardelacal/dev/goodfriday
...
Good friday is a holiday
2021-04-10 12:33:26 +02:00
Laurent Destailleur
1b88f05f28
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-04-10 12:06:21 +02:00
Laurent Destailleur
3895142772
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
2021-04-10 12:06:11 +02:00
César de la Cal Bretschneider
eadd8defaf
Good friday is a holiday
2021-04-10 11:39:48 +02:00
Laurent Destailleur
83e272951f
Fix phpcs
2021-04-10 00:31:20 +02:00
Laurent Destailleur
52213d0ac7
Fix duplicate permissions
2021-04-09 21:15:43 +02:00
Ahmad Hadeed
63f7369adb
Fixing 'stickler-ci' complaint, function description not in order
2021-04-09 21:16:24 +03:00
Ahmad Hadeed
20e51016ed
fixing function description comment to satisfy 'stickler-ci'
2021-04-09 21:11:37 +03:00
Ahmad Hadeed
937fe333f1
Moving Friday to end of function declaration to maintain backward compatibility
2021-04-09 20:49:39 +03:00
Dorian Vabre
b3415f9031
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-09 16:23:42 +02:00
lmarcouiller
19ee78e123
Close #17193 : Move button convert in webp
2021-04-09 15:44:47 +02:00
Laurent Destailleur
42ddb6e5f0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/website2.lib.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/paiementfourn.class.php
htdocs/public/ticket/view.php
2021-04-09 14:17:41 +02:00
Laurent Destailleur
4b1974080a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-04-09 14:02:24 +02:00
Laurent Destailleur
f5881c6199
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/index.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-04-09 14:02:14 +02:00
Laurent Destailleur
b008cb6b6f
Merge pull request #17147 from glu000/13.0-fix17146
...
13.0-fix17146
2021-04-09 13:57:50 +02:00
Laurent Destailleur
4016c300d2
Fix missing lin to thirdparty on some actions
2021-04-09 13:38:29 +02:00
Laurent Destailleur
a50b0e7441
Debug inventory module
2021-04-09 13:15:27 +02:00
NextGestion
d6e4cb7d0b
Merge branch 'develop' into dolibarr_partnership
2021-04-09 12:01:44 +01:00
Laurent Destailleur
95d3dabdf6
Update website2.lib.php
2021-04-09 12:48:06 +02:00
Gauthier PC portable 024
c35c15e782
FIX : test must be === and not ==
2021-04-09 11:31:50 +02:00
Laurent Destailleur
d098bf412d
Move directory to match the one of composer package for phpspreadsheet
2021-04-08 17:35:52 +02:00
Dorian Vabre
60341e8a14
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_EventOrganizer
2021-04-08 17:29:16 +02:00
Laurent Destailleur
f8b5bee9eb
Add function getListOfPossibleImageExt
2021-04-08 14:20:59 +02:00
Laurent Destailleur
244e83e18d
Merge pull request #17164 from draceo/art261-7
...
Add bill tax code article for non profit organization VAT (fixes #17163 )
2021-04-08 13:46:22 +02:00
stickler-ci
c2cd54325f
Fixing style errors.
2021-04-08 11:44:24 +00:00
Laurent Destailleur
aacea00460
Merge pull request #17167 from OPEN-DSI/fix_00004
...
NEW : Add new permok for edit extrafields on contact card
2021-04-08 13:43:39 +02:00
Anthony Berton
f613688b28
add_option
2021-04-08 13:37:09 +02:00
Laurent Destailleur
93269bab9e
Merge pull request #17183 from OPEN-DSI/fix_00005
...
FIX : Fix warning
2021-04-08 13:14:53 +02:00
kamel
1ec6317b80
FIX : Fix warning (function errorHandler() is not defined in this class so let the class handle the errors)
2021-04-08 10:33:27 +02:00
Laurent Destailleur
489cff46a3
FIX #yogosha5828
2021-04-08 00:37:17 +02:00
Laurent Destailleur
59c8e70fd2
Fix #yogosha4510
2021-04-07 23:43:10 +02:00
Laurent Destailleur
6c4f5b851d
Use all param of getURLContent
2021-04-07 23:31:16 +02:00
Laurent Destailleur
1e1b963ca7
Restriction on name of files
2021-04-07 19:38:54 +02:00
kamel
c06cc6d75a
NEW : Add new permok for edit extrafields on contact card
2021-04-07 17:28:13 +02:00
Florent Peyraud
7be9a98ef0
Add bill tax code article for non profit organization VAT
2021-04-07 13:51:08 +02:00
NextGestion
ace958240d
Merge branch 'develop' into dolibarr_partnership
2021-04-07 12:30:37 +01:00
stickler-ci
c9aed75837
Fixing style errors.
2021-04-07 11:24:31 +00:00
NextGestion
5f5f0eb3f3
Add menu entries into thirdparty menu or member menu & Allow extrafields
2021-04-07 12:21:59 +01:00
Laurent Destailleur
f4d56c710b
Fix log levels
2021-04-07 12:43:28 +02:00
Dorian Vabre
f7b6e239e9
nouvelle page attendee_subscription créée, lien ajouté sur la conferenceorbooth_card (non cliquable)
2021-04-07 10:06:38 +02:00
Indelog
17fa9559a3
Fix empty string WEBSITE_OTHERLANG
...
If post WEBSITE_OTHERLANG with empty value or with value like this
'en,,sv' or 'en,sv,' we can get an otherlang with empty value. This can lead
unexpected behaviour when we use an element of otherlang to set the
subdirectory name to store pages for a sub lang.
2021-04-07 09:29:40 +02:00
Günter Lukas
04a55a3df3
Fix #17146
2021-04-07 09:08:34 +02:00
Laurent Destailleur
fcc6431896
Merge pull request #17136 from aspangaro/14a35
...
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-07 02:51:32 +02:00
Indelog
4d60fe8ff9
Fix empty $sublang dolSavePageAlias
...
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
2021-04-06 22:21:00 +02:00
Laurent Destailleur
12e847ade1
Fix color of reports. Fix include_once into include.
2021-04-06 22:18:32 +02:00
Laurent Destailleur
7ff74768eb
Fix pb with renaming field total
2021-04-06 20:16:14 +02:00
Laurent Destailleur
0377508100
Fix sql
2021-04-06 20:10:29 +02:00
Laurent Destailleur
dbc1780817
Merge pull request #16376 from aspangaro/14a22
...
Code enhanced - Standardize field name #14697
2021-04-06 20:01:38 +02:00
NextGestion
78b4aa61fa
Add a new tab "Partnership" on the record of a thirdparty or a member (depending on setup)
2021-04-06 18:57:45 +01:00
Laurent Destailleur
b7cd3270cb
Merge pull request #17118 from ptibogxiv/patch-424
...
FIX uniformization of external link
2021-04-06 19:36:26 +02:00
Laurent Destailleur
bbbf1dc7c8
Merge pull request #17133 from dolibit-ut/patch-235
...
Update box.php
2021-04-06 19:31:45 +02:00
Laurent Destailleur
d1df327284
Add tab for import/export profiles
2021-04-06 18:51:43 +02:00
Laurent Destailleur
38f3693fc7
Look and feel v14
2021-04-06 18:18:07 +02:00
NextGestion
debef2fb6d
initial Batch to cancel partnership for expired members
2021-04-06 15:53:51 +01:00
Laurent Destailleur
10fb793fb1
Enhance the security page
2021-04-06 13:56:33 +02:00
Alexandre SPANGARO
36e4f5aa22
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-06 10:29:44 +02:00
Alexandre SPANGARO
82b652df8a
NEW: Add deposit on supplier invoice (& somes ajustments)
2021-04-06 09:15:34 +02:00
Ahmad Hadeed
f2f2aed6cd
Fix 3 weekend holiday behavior after adding support to Friday as a holiday.
2021-04-05 22:05:22 +03:00
UT from dolibit
40059f1d05
Update box.php
...
$userid defined twice
2021-04-05 20:37:58 +02:00
Laurent Destailleur
a3fb8d3e14
Factorize code
2021-04-05 19:34:56 +02:00
stickler-ci
caa2facd47
Fixing style errors.
2021-04-05 17:09:25 +00:00
Ahmad Hadeed
235725b528
Add support for Friday as a holiday and some comment alignment fixes
2021-04-05 19:57:33 +03:00
Laurent Destailleur
95de241245
FIx #yogosha5774
2021-04-05 15:21:17 +02:00
Laurent Destailleur
685c880e6c
Debug module workstation
2021-04-05 14:56:47 +02:00
Laurent Destailleur
6c521073ea
Fix perm id and sort of modules by id.
2021-04-05 13:52:19 +02:00
ptibogxiv
1b3b2ca023
Update payments.lib.php
2021-04-05 13:52:09 +02:00
Laurent Destailleur
6fc19c626d
Try fix for #17094
2021-04-04 17:05:01 +02:00
Alexandre SPANGARO
f64d0377c5
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-04-04 06:03:41 +02:00
Laurent Destailleur
1a70aebba6
NEW Can set a target image in dolcropresize function.
2021-04-04 01:12:25 +02:00
Givriz
5ed01f6733
Fix errors phpv8
2021-04-03 17:09:14 +02:00
Laurent Destailleur
17437670b1
Set include of js as async
2021-04-03 13:24:34 +02:00
NextGestion
21f86c05d4
Merge branch 'develop' into dolibarr_partnership
2021-04-03 09:44:21 +01:00
NextGestion
6cac5f2212
Create Partnership Module
2021-04-03 09:24:07 +01:00
Laurent Destailleur
5ce9bc5801
FIX #yogosha5748
2021-04-02 23:23:44 +02:00
Laurent Destailleur
cadef101db
Fix var name
2021-04-02 21:40:33 +02:00
Laurent Destailleur
b237126679
Clean code
2021-04-02 13:33:41 +02:00
Laurent Destailleur
c23610f851
Rename const
2021-04-02 13:31:03 +02:00
Laurent Destailleur
5d7efcc0d1
Merge pull request #17063 from aspangaro/13p31
...
FIX: Periodicity by default on fiscal year, according to the now date, we have plus 1 year added
2021-04-02 01:53:24 +02:00
Laurent Destailleur
39fc2e6e60
NEW Save old page with .old in edition of a website page
2021-04-01 19:49:36 +02:00
Laurent Destailleur
d4f14183b7
Code comment
2021-04-01 13:15:23 +02:00
Laurent Destailleur
06078f231b
NEW Can show the project ref or label into PDF documents
2021-04-01 13:02:44 +02:00
Florian Mortgat
f5617a6247
FIX 13.0 warning - missing quotes around 'label'
2021-04-01 12:33:23 +02:00
Laurent Destailleur
354adbde54
Look and feel v14
2021-04-01 12:27:02 +02:00
Laurent Destailleur
8e14b4d434
FIX #yogosha5775
2021-04-01 11:27:39 +02:00
Alexandre SPANGARO
b5702fcb13
Merge branch '13.0' into 13p31
2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e
FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added
2021-04-01 04:37:47 +02:00
Laurent Destailleur
6fc70fba8c
Merge pull request #16981 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-31 22:29:39 +02:00
Laurent Destailleur
5e67427922
Merge pull request #16483 from frederic34/repairToUtf8mb4
...
NEW Add experimental repair script to switch to dynamic row format and utf8mb4 encoding
2021-03-31 22:28:58 +02:00
Laurent Destailleur
55741506c8
Merge pull request #17053 from aspangaro/14a30
...
NEW: Accountancy - Add FEC import
2021-03-31 22:15:26 +02:00
Alexandre SPANGARO
dd913b2385
Update
2021-03-31 20:40:26 +02:00
Florian HENRY
73d7eefdcf
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-31 20:09:44 +02:00
Frédéric FRANCE
1823fb34bb
Merge remote-tracking branch 'upstream/develop' into repairToUtf8mb4
2021-03-31 18:41:49 +02:00
Laurent Destailleur
2e3af575be
Look and feel v14
2021-03-31 18:12:26 +02:00
Laurent Destailleur
b695c4a1c8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-31 13:59:35 +02:00
Laurent Destailleur
14c7ce7492
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/reception/card.php
2021-03-31 13:59:21 +02:00
Laurent Destailleur
89dbd745bf
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/modules/modAccounting.class.php
2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-31 13:47:00 +02:00
Laurent Destailleur
7641f7258b
Merge pull request #17044 from aspangaro/14a27
...
FIX: Add a sub table to manage accountancy on product/company
2021-03-31 13:39:17 +02:00
Laurent Destailleur
6aa1229c19
FIX #yogosha5791
2021-03-31 12:44:13 +02:00
Laurent Destailleur
625ade1a53
Clean log
2021-03-31 12:41:44 +02:00
Ferran Marcet
b6faa6b605
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4
FIX: Accountancy - Import in general ledger
2021-03-31 05:07:05 +02:00
Alexandre SPANGARO
9b65529fc7
NEW: Accountancy - Add FEC import
2021-03-31 04:59:12 +02:00
Alexandre SPANGARO
5723dbb836
FIX: Add a sub table to manage accountancy on product/company
2021-03-31 04:52:24 +02:00
Alexandre SPANGARO
38d47c184e
FIX: Add a sub table to manage accountancy on product/company
2021-03-30 22:12:57 +02:00
Alexandre SPANGARO
4e30481fa2
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-30 22:05:03 +02:00
Laurent Destailleur
38f1710b43
Merge pull request #17020 from Hystepik/develop#1
...
Close #4951 : New module Inventory
2021-03-30 20:43:52 +02:00
Laurent Destailleur
48f97d77df
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-30 19:35:25 +02:00
Laurent Destailleur
cdd3e385e7
Merge branch 'new-propal-signature-date-and-user' of
...
https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-new-propal-signature-date-and-user
# Conflicts:
# htdocs/install/mysql/migration/13.0.0-14.0.0.sql
2021-03-30 19:34:25 +02:00
Laurent Destailleur
78b8af3a4a
Merge pull request #17038 from frederic34/patch-3
...
fix missing global mod_facture_mars.php
2021-03-30 19:18:50 +02:00
Laurent Destailleur
32287d8734
Merge pull request #17036 from dolibit-ut/patch-196
...
Update box_supplier_orders_awaiting_reception.php
2021-03-30 19:18:20 +02:00
Laurent Destailleur
d905d2e22d
Merge pull request #17035 from dolibit-ut/patch-195
...
Update box_accountancy_suspense_account.php
2021-03-30 19:18:12 +02:00
Frédéric FRANCE
4c874ddf15
Update mod_facture_terre.php
2021-03-30 18:35:46 +02:00
Frédéric FRANCE
a9e720eec3
Update mod_facture_mars.php
2021-03-30 18:33:52 +02:00
UT from dolibit
34077d5b8a
Update canvas.class.php
2021-03-30 18:31:36 +02:00
UT from dolibit
479421d923
Update box_supplier_orders_awaiting_reception.php
...
https://
2021-03-30 18:30:07 +02:00
UT from dolibit
0203eab0b0
Update box_accountancy_suspense_account.php
...
https://
2021-03-30 18:28:07 +02:00
Laurent Destailleur
3744bc6a7a
FIX #yogosha5746 - next step (work in progress)
2021-03-30 18:17:13 +02:00
Laurent Destailleur
fae3cca494
FIX #yogosha5746 - next step (work in progress)
2021-03-30 17:45:15 +02:00
Laurent Destailleur
9ad3ba1572
Fix regression in export
2021-03-30 17:28:58 +02:00
Laurent Destailleur
6e422d26f3
FIX #yogosha5746 - next step (wip)
2021-03-30 16:20:18 +02:00
lmarcouiller
55560b7d38
Inventory module working
2021-03-30 12:35:20 +02:00
Laurent Destailleur
6c98276ead
FIX #yogosha5782
2021-03-30 11:26:49 +02:00
Ferran Marcet
b4f638602a
FIX: Show Ref.Supplier in LinkToObjectBlock
2021-03-30 11:10:07 +02:00
lvessiller
85fff685db
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:19:54 +02:00
lvessiller
d0ce60ff49
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-propal-signature-date-and-user
2021-03-30 08:04:19 +02:00
Laurent Destailleur
fb84608586
Clean sql
2021-03-30 03:37:54 +02:00
Alexandre SPANGARO
ea6b22f06e
FIX: Add a sub table to manage accountancy on product/company
2021-03-30 03:27:46 +02:00
Laurent Destailleur
9edb2fd857
Fix sql error
2021-03-30 02:13:57 +02:00
Laurent Destailleur
b863b2a3f3
Look and feel v14
2021-03-30 02:01:08 +02:00
Laurent Destailleur
c2d583e665
Fix picto
2021-03-30 01:44:50 +02:00
Laurent Destailleur
3616d2ba44
FIX #yogosha5770
2021-03-29 23:24:52 +02:00
Laurent Destailleur
843e0a2c39
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
2021-03-29 21:47:31 +02:00
Laurent Destailleur
2689bc938d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyaccount.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2021-03-29 21:37:21 +02:00
Laurent Destailleur
adf15e4e64
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-29 21:04:49 +02:00
Laurent Destailleur
ae0468e107
FIX #yogosha5765
2021-03-29 21:04:33 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22
2021-03-29 20:35:35 +02:00
Florian HENRY
11dcf656c6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 20:30:31 +02:00
Laurent Destailleur
5bbfe7ed19
Merge pull request #16930 from aspangaro/14a27
...
NEW: Add a sub table to manage accountancy on product/company
2021-03-29 20:11:02 +02:00
Laurent Destailleur
715490be0b
Merge pull request #16929 from aspangaro/14a28
...
NEW: Add company info in dropdown login menu
2021-03-29 19:02:12 +02:00
Laurent Destailleur
a23a2a0119
Merge pull request #16988 from daraelmin/daraelmin-patch-excluded
...
Fix #16899 New stuff related to excluded members forgotten during transfer to box graph
2021-03-29 17:39:58 +02:00
Florian HENRY
14a90a3a9d
on goung
2021-03-29 17:26:43 +02:00
Laurent Destailleur
96363b3913
Merge pull request #16974 from ksar-ksar/develop
...
FIX #16940
2021-03-29 17:07:19 +02:00
Florian HENRY
e18c010490
fix bug on list
2021-03-29 16:25:34 +02:00
Florian HENRY
f25360cc4c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-29 15:49:43 +02:00
Laurent Destailleur
3a4bb69c05
FIX #yogosha5749
2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4
FIX #yogosha5746
2021-03-29 15:07:23 +02:00
Laurent Destailleur
e03fbda96a
Avoid to obfuscate attributes with html tags inside
2021-03-29 14:50:44 +02:00
Laurent Destailleur
4cacca413e
FIX #yogosha5757
2021-03-29 14:43:40 +02:00
Laurent Destailleur
e382d49299
Fix bad permission
2021-03-29 13:49:24 +02:00
Laurent Destailleur
b929641fe1
Look and feel v14
2021-03-29 13:00:17 +02:00
Florian HENRY
5926db2704
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft1
2021-03-29 12:10:35 +02:00
Laurent Destailleur
85f6a15678
Fix position of users in combo list
2021-03-29 11:58:51 +02:00
Laurent Destailleur
ad6f5e5a64
Fix permission export of services
2021-03-29 10:26:17 +02:00
daraelmin
8a43d65476
Copyright box_members_by_type.php
2021-03-29 07:49:15 +02:00
Laurent Destailleur
2a431d4951
Protect backtourl from using external urls
2021-03-28 21:39:18 +02:00
Laurent Destailleur
a5d84200dc
Clean code for invoice list
2021-03-28 19:22:04 +02:00
Alexandre SPANGARO
2a1cc04b66
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-28 06:16:33 +02:00
Laurent Destailleur
95a7e13e3a
Debug establishment
2021-03-27 14:54:09 +01:00
Laurent Destailleur
5b64a517ea
Fix label
2021-03-27 14:30:10 +01:00
Laurent Destailleur
1bb07c0eb1
Look and feel v14
2021-03-27 13:59:50 +01:00
stickler-ci
6a9d6a8634
Fixing style errors.
2021-03-27 12:44:34 +00:00
daraelmin
bad5aa6468
fix excluded member color in graph
2021-03-27 13:39:15 +01:00
Laurent Destailleur
1d48b883a7
Look and feel v14
2021-03-27 13:17:56 +01:00
daraelmin
c8a455edf4
add excluded memer on graph
2021-03-27 13:14:59 +01:00
Alexandre SPANGARO
22f809c517
Move to _PERENTITY
2021-03-27 05:23:20 +01:00
Alexandre SPANGARO
6422b0a6c0
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-27 05:02:55 +01:00
Alexandre SPANGARO
c1ceefb70f
Update with new functionality
2021-03-27 04:44:20 +01:00
Alexandre SPANGARO
6809dab2c0
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-27 04:12:15 +01:00
Florian HENRY
3e12820f0e
fix comment
2021-03-26 18:37:11 +01:00
Florian HENRY
f87711bf2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-26 18:30:08 +01:00
Laurent Destailleur
01c1101b29
Look and feel v14
2021-03-26 18:16:12 +01:00
lvessiller
05bf3cdab1
FIX stickler-ci errors
2021-03-26 17:59:16 +01:00
Laurent Destailleur
84ec032cc0
Look and feel v14
2021-03-26 17:58:00 +01:00
lvessiller
8a2e49d6e7
NEW date and user signature on proposal (Issue 16062)
2021-03-26 17:44:41 +01:00
Laurent Destailleur
cfd992b930
Add call of rebuild_sequence with pgsql.
2021-03-26 13:10:06 +01:00
Laurent Destailleur
02ba8810cf
Better error message
2021-03-26 12:23:42 +01:00
Laurent Destailleur
44cb9dca67
FIX must use getUrlContent to get external url in RSS module
2021-03-25 19:05:01 +01:00
Laurent Destailleur
d9108362ba
War against $_POST
2021-03-25 16:59:47 +01:00
stickler-ci
c3d8df3ab2
Fixing style errors.
2021-03-25 13:53:41 +00:00
ksar
288d8d97cc
FIX #16940
...
Update nblines after hook
2021-03-25 14:52:17 +01:00
ksar
ccd6d28f6f
FIX #16843
...
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4
fa-mail-forward => fa-share
2021-03-25 14:39:42 +01:00
Laurent Destailleur
172b615d6c
Debug auto numbering of lot/serial.
2021-03-25 11:51:29 +01:00
Laurent Destailleur
5ddd98cd39
Move module intracomm as experimental
2021-03-25 11:24:46 +01:00
Laurent Destailleur
ff52b1ee41
Merge pull request #16620 from altairisfr/pr_batch_masks
...
Define Masks for Batch Products Equipments
2021-03-25 08:36:36 +01:00
Laurent Destailleur
a4aa806e44
Merge pull request #16933 from daraelmin/daraelmin-patch-2
...
Fix #16794 V13 order by status instead of statut
2021-03-25 08:31:44 +01:00
Laurent Destailleur
5af02d96cd
Show entity for user only if different than current entity
2021-03-25 03:58:54 +01:00
Laurent Destailleur
dce3b3e7af
Rename page to avoid to have an index.html page
2021-03-25 03:47:45 +01:00
Laurent Destailleur
594c94feb2
Clean code. Allow iframes into the external frame module.
2021-03-25 03:44:38 +01:00
Laurent Destailleur
930742dadf
Merge pull request #16846 from ptibogxiv/patch-418
...
NEW auto notification with templated emails
2021-03-25 01:48:44 +01:00
Laurent Destailleur
52625325ff
Merge pull request #16922 from dolibit-ut/patch-155
...
Create index.html
2021-03-25 01:39:12 +01:00
Laurent Destailleur
6eac8ee25d
Merge pull request #16921 from dolibit-ut/patch-154
...
Create index.html
2021-03-25 01:39:03 +01:00
Laurent Destailleur
e994fbf093
Merge pull request #16923 from dolibit-ut/patch-156
...
Create index.html
2021-03-25 01:30:53 +01:00
Laurent Destailleur
36a49aacee
Merge pull request #16924 from dolibit-ut/patch-157
...
Create index.html
2021-03-25 01:30:45 +01:00
Laurent Destailleur
3f8d71d024
Merge pull request #16950 from code42fr/fix_translation_tag_#16941
...
Fix translation tag #16941
2021-03-25 00:26:48 +01:00
Laurent Destailleur
87bb84310d
Update translate.class.php
2021-03-25 00:26:16 +01:00
Laurent Destailleur
b011a67698
Fix remove var_dump
2021-03-25 00:03:31 +01:00
Laurent Destailleur
cc54b7fe29
Fix dol_string_onlythesehtmlattributes
2021-03-25 00:03:09 +01:00
Laurent Destailleur
6f01869bcb
Enhance the WAF
2021-03-24 23:14:22 +01:00
Laurent Destailleur
d1fa46089f
Removed not used page.
...
Enhance the WAF
2021-03-24 22:54:40 +01:00
Laurent Destailleur
eeba9e4d50
Code comment
2021-03-24 21:58:06 +01:00
Laurent Destailleur
21a9779fe2
FIX inconsistency in margin recording with option "Force to sale price"
2021-03-24 21:49:45 +01:00
Florian HENRY
e898fbb834
almost done
2021-03-24 21:21:53 +01:00
Florian HENRY
373a52063d
add commit
2021-03-24 20:13:30 +01:00
Laurent Destailleur
a5034d44f7
$_POST war
2021-03-24 19:53:31 +01:00
Laurent Destailleur
86c7ab922a
Fix #yogosha5728
2021-03-24 18:57:23 +01:00
Alexandre SPANGARO
34abb53c25
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-24 14:09:46 +01:00
Laurent Destailleur
1a5d129bd0
Fix #yogosha5731
2021-03-24 13:32:09 +01:00
Laurent Destailleur
211c5b53eb
NEW Can set if a ticket group is visible on public interface or not.
2021-03-24 13:16:17 +01:00
Laurent Destailleur
37c04b794f
Add property "ticket group is public" in dicitonary of ticket groups.
2021-03-24 12:13:23 +01:00
Laurent Destailleur
4ecd1def49
css
2021-03-24 11:00:26 +01:00
hugo
8a1cd3e471
FIX #16941 langs trans escape tag <i
2021-03-24 10:08:19 +01:00
Laurent Destailleur
367ff3c9f0
Look and feel v14
2021-03-24 01:53:08 +01:00
Florian HENRY
ebe0b503f6
working on attendees
2021-03-23 22:12:20 +01:00
Laurent Destailleur
4d1fdd8763
Fix #yogosha5725
2021-03-23 21:45:37 +01:00
Florian HENRY
d043c8f4ba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-03-23 21:05:11 +01:00
Florian HENRY
cc78e7c685
add field on conf or booth tabs
2021-03-23 21:04:38 +01:00
Laurent Destailleur
02509ccbc4
Responsive
2021-03-23 20:39:11 +01:00
Laurent Destailleur
28ca2990f0
CSS
2021-03-23 20:09:26 +01:00
ATM john
4f693b86c2
shhhhhh ! There is nothing here...
2021-03-23 19:27:40 +01:00
Laurent Destailleur
3857daed94
Fix remove log
2021-03-23 18:08:44 +01:00
Laurent Destailleur
5ff9038e4e
Fix permissions on BOMs
2021-03-23 18:02:52 +01:00
Laurent Destailleur
cfa39597c3
FIX #yogosha5707
2021-03-23 17:28:38 +01:00
Laurent Destailleur
7c69b45c68
FIX #yogosha5707
2021-03-23 17:27:43 +01:00
Laurent Destailleur
053fe4831a
Fix translations
2021-03-23 16:59:12 +01:00
Laurent Destailleur
538547acfe
Add currency into combo of bank account (for a future use in js)
2021-03-23 16:26:31 +01:00
Laurent Destailleur
00e48aa922
Clean and secured code for ajax/row.php
2021-03-23 16:09:02 +01:00
Laurent Destailleur
b275789223
Fix regression
2021-03-23 12:22:30 +01:00
Laurent Destailleur
a1366da130
FIX #yogosha5715
2021-03-23 03:45:17 +01:00
Laurent Destailleur
e3b019f923
Clean code
2021-03-23 01:32:17 +01:00
Laurent Destailleur
af593099df
Clean string
2021-03-22 23:52:14 +01:00
Laurent Destailleur
f7ba0ee381
Fix set of parent company with ajax
2021-03-22 22:50:43 +01:00
Laurent Destailleur
cce4ebdb8c
Clean code
2021-03-22 18:50:47 +01:00
Laurent Destailleur
5a8d757a30
Add missing data
2021-03-22 18:23:29 +01:00
Laurent Destailleur
5d6fb0cfea
Perf: Enhance performance of VAT report
2021-03-22 18:11:44 +01:00
Laurent Destailleur
df9546662a
Fix trans
2021-03-22 16:18:31 +01:00
Laurent Destailleur
897d653144
Debug default date for vat reports
2021-03-22 16:09:18 +01:00
Laurent Destailleur
ca1715df96
Add some protection for SQL injection
2021-03-22 13:31:06 +01:00
Laurent Destailleur
6063b02bf4
Fix #ygosha5698
2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06
Fix #ygosha5698
2021-03-22 12:10:51 +01:00
Laurent Destailleur
15440917b1
Fix #ygosha5698
2021-03-22 11:30:18 +01:00
daraelmin
6ba878725e
Fix #16794 V13 order by status instead of statut
2021-03-22 07:28:16 +01:00
stickler-ci
5af4b4673c
Fixing style errors.
2021-03-21 22:12:36 +00:00
Alexandre SPANGARO
0c2ada4299
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-21 23:08:01 +01:00
Alexandre SPANGARO
17e0cc4bad
Merge remote-tracking branch 'upstream/develop' into 14a28
2021-03-21 22:59:41 +01:00
Alexandre SPANGARO
ea938f64da
NEW: Add company info in dropdown login menu
2021-03-21 22:58:21 +01:00
Laurent Destailleur
4ac5d32c48
Fix picto
2021-03-21 22:27:12 +01:00
UT from dolibit
32cf5240f8
Create index.html
2021-03-21 22:17:50 +01:00
Laurent Destailleur
9d1dcccb86
Fix css
2021-03-21 22:15:37 +01:00
UT from dolibit
e6a2243627
Create index.html
2021-03-21 22:15:33 +01:00
UT from dolibit
6dc0d8202b
Create index.html
2021-03-21 22:14:13 +01:00
UT from dolibit
34b1b18a89
Create index.html
2021-03-21 22:12:19 +01:00
Laurent Destailleur
2a7b687fbf
Merge pull request #16918 from dolibit-ut/patch-151
...
Create index.html
2021-03-21 21:47:04 +01:00
Laurent Destailleur
4806d2f40b
Merge pull request #16916 from dolibit-ut/patch-149
...
Create index.html
2021-03-21 21:46:56 +01:00
Laurent Destailleur
ffb81d5acc
Merge pull request #16905 from dolibit-ut/patch-138
...
Create index.html
2021-03-21 21:46:49 +01:00
Laurent Destailleur
fa82f2161f
Merge pull request #16915 from dolibit-ut/patch-148
...
Create index.html
2021-03-21 21:46:43 +01:00
Laurent Destailleur
7f9199691a
Merge pull request #16908 from dolibit-ut/patch-141
...
Create index.html
2021-03-21 21:46:36 +01:00
Laurent Destailleur
4f025e419e
Merge pull request #16901 from dolibit-ut/patch-134
...
Create index.html
2021-03-21 21:46:29 +01:00
Laurent Destailleur
92b5d12574
Merge pull request #16903 from dolibit-ut/patch-136
...
Create index.html
2021-03-21 21:46:21 +01:00
Laurent Destailleur
2a25f3096c
Merge pull request #16902 from dolibit-ut/patch-135
...
Create index.html
2021-03-21 21:46:14 +01:00
Laurent Destailleur
449315c225
Merge pull request #16904 from dolibit-ut/patch-137
...
Create index.html
2021-03-21 21:46:07 +01:00
Laurent Destailleur
5ccbd62fc8
Merge pull request #16906 from dolibit-ut/patch-139
...
Create index.html
2021-03-21 21:45:59 +01:00
Laurent Destailleur
b798321f09
Merge pull request #16913 from dolibit-ut/patch-146
...
Create index.html
2021-03-21 21:45:53 +01:00
Laurent Destailleur
84487e4ef8
Merge pull request #16907 from dolibit-ut/patch-140
...
Create index.html
2021-03-21 21:45:46 +01:00
Laurent Destailleur
472fe901a7
Merge pull request #16909 from dolibit-ut/patch-142
...
Create index.html
2021-03-21 21:45:39 +01:00
Laurent Destailleur
ddea352092
Merge pull request #16910 from dolibit-ut/patch-143
...
Create index.html
2021-03-21 21:45:32 +01:00
Laurent Destailleur
d9ec217210
Merge pull request #16912 from dolibit-ut/patch-145
...
Create index.html
2021-03-21 21:45:25 +01:00
Laurent Destailleur
a78e62a16e
Merge pull request #16914 from dolibit-ut/patch-147
...
Create index.html
2021-03-21 21:45:18 +01:00
UT from dolibit
9eb50eee00
Create index.html
2021-03-21 21:40:37 +01:00
UT from dolibit
0241e2d449
Create index.html
2021-03-21 21:38:53 +01:00
UT from dolibit
98c2c59486
Create index.html
2021-03-21 21:36:41 +01:00
UT from dolibit
39190dc07f
Create index.html
2021-03-21 21:34:21 +01:00
UT from dolibit
5b028d192d
Create index.html
2021-03-21 21:33:39 +01:00
UT from dolibit
9925cdcbee
Create index.html
2021-03-21 21:32:35 +01:00
UT from dolibit
d0cace4f2c
Create index.html
2021-03-21 21:32:05 +01:00
UT from dolibit
50672bfe31
Create index.html
2021-03-21 21:19:54 +01:00
UT from dolibit
2a069a0a2c
Create index.html
2021-03-21 21:19:12 +01:00
UT from dolibit
4b3b4d072a
Create index.html
2021-03-21 21:17:12 +01:00
UT from dolibit
2f957667ed
Create index.html
2021-03-21 21:16:32 +01:00
UT from dolibit
163b960da9
Create index.html
2021-03-21 21:15:40 +01:00
UT from dolibit
8ec3c4a5b5
Create index.html
2021-03-21 21:14:52 +01:00
UT from dolibit
21a2b4e222
Create index.html
2021-03-21 21:13:33 +01:00
ptibogxiv
6d26b4aec3
Update notify.class.php
2021-03-21 21:11:39 +01:00
UT from dolibit
e4921fa843
Create index.html
2021-03-21 21:11:01 +01:00
UT from dolibit
c0e7800251
Create index.html
2021-03-21 21:10:13 +01:00
UT from dolibit
ae91f3be63
Create index.html
2021-03-21 21:07:25 +01:00
Laurent Destailleur
800eeef868
Clean code
2021-03-21 18:20:37 +01:00
Laurent Destailleur
3c8bf2167b
Debug permissions
2021-03-21 18:01:43 +01:00
Laurent Destailleur
af199189b3
NEW Add color and picto for direction of movement
2021-03-21 13:46:01 +01:00
Laurent Destailleur
eeb1c5d884
Replace deprecated code
2021-03-20 21:46:10 +01:00
Laurent Destailleur
2b3599dba5
Clean code
2021-03-20 21:29:36 +01:00
Laurent Destailleur
70be2dbcf0
Fix regression in tests
2021-03-20 20:51:19 +01:00
Laurent Destailleur
9900429fd0
Merge pull request #16889 from frederic34/adherent_to_member
...
rename files from adherent to member
2021-03-20 20:37:44 +01:00
Laurent Destailleur
8f6f8248a3
Merge pull request #16885 from daraelmin/daraelmin-patch-4
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 19:51:26 +01:00
Laurent Destailleur
861a5becf1
Merge pull request #16884 from daraelmin/daraelmin-patch-3
...
#Fix #16767 v13 unremovable attached file in mailmodel
2021-03-20 19:51:07 +01:00
Laurent Destailleur
e330c0f91a
Merge pull request #16883 from aspangaro/14a28
...
Uniformize information on modules
2021-03-20 19:49:33 +01:00
Laurent Destailleur
a2b3afb511
Merge branch 'develop' into 14a22
2021-03-20 19:48:43 +01:00
Laurent Destailleur
46aa01aea0
Fix permission on export of BOM and website
2021-03-20 19:15:15 +01:00
Frédéric FRANCE
d2f7d3064d
can use $conf->member
2021-03-20 19:09:49 +01:00
Frédéric FRANCE
f6e7285949
rename files from adherent to member
2021-03-20 19:06:15 +01:00
daraelmin
cb71936ccd
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 make default attached file of a mail model selected removable
2021-03-20 14:10:56 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel
...
#Fix #16767 unremovable attached file in mailmodel
2021-03-20 14:04:20 +01:00
Alexandre SPANGARO
3669c374c2
Uniformize information on modules
2021-03-20 13:55:43 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22
2021-03-20 13:42:54 +01:00
Laurent Destailleur
e1f23105a6
Finally try to follow install per entity instead of per instance.
2021-03-20 12:49:44 +01:00
Laurent Destailleur
65bf47b693
Merge pull request #16845 from hregis/fix_warning_php8
...
FIX avoid php8 warning with multicompany
2021-03-20 12:46:02 +01:00
stickler-ci
625f72303b
Fixing style errors.
2021-03-20 11:43:13 +00:00
Laurent Destailleur
d8aa5f5eab
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2021-03-20 12:42:46 +01:00
Regis Houssin
29e090b025
FIX force to entity 0 for all entities
2021-03-20 12:35:41 +01:00
Regis Houssin
573ca669da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_warning_php8
2021-03-20 12:11:12 +01:00
Laurent Destailleur
ee84bef3b2
Merge pull request #16828 from frederic34/membersboxfix
...
fix new boxes add
2021-03-20 11:52:19 +01:00
Laurent Destailleur
2da85a9ca2
Merge pull request #16842 from hregis/fix_avoid_warning_php8
...
FIX avoid php8 warning in products list
2021-03-20 11:48:53 +01:00
Laurent Destailleur
285b166b12
Merge pull request #16849 from frederic34/ecmindex
...
fix php8 warnings
2021-03-20 11:37:00 +01:00
Laurent Destailleur
3cc8a8e2ee
Merge pull request #16850 from frederic34/patch-4
...
fix php8 warning
2021-03-20 11:28:47 +01:00
Laurent Destailleur
e54ca79a8c
Merge pull request #16854 from frederic34/confglobal
...
get conf global function
2021-03-20 11:26:32 +01:00
Laurent Destailleur
25f1b82c34
Merge pull request #16859 from frederic34/patch-11
...
fix doxygen
2021-03-20 11:24:50 +01:00
Laurent Destailleur
5f0a2e648b
Merge pull request #16871 from frederic34/patch-19
...
fix doxygen
2021-03-20 11:15:48 +01:00
Laurent Destailleur
685ec0bc63
Merge pull request #16872 from frederic34/patch-22
...
fix doxygen
2021-03-20 11:15:32 +01:00
Laurent Destailleur
3ce4762710
Merge pull request #16873 from frederic34/patch-23
...
fix doxygen
2021-03-20 11:15:22 +01:00
Laurent Destailleur
bc639045c0
Merge pull request #16874 from frederic34/patch-24
...
fix doxygen
2021-03-20 11:15:12 +01:00
Laurent Destailleur
810b15f73a
Merge pull request #16875 from frederic34/patch-25
...
fix doxygen
2021-03-20 11:14:57 +01:00
Laurent Destailleur
1d2b3a0967
Merge pull request #16876 from frederic34/patch-26
...
fix doxygen
2021-03-20 11:12:46 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings
2021-03-20 10:50:02 +01:00
Frédéric FRANCE
65c3dced1c
fix doxygen
2021-03-20 10:34:23 +01:00
Frédéric FRANCE
5da597d947
fix doxygen
2021-03-20 10:32:18 +01:00
Frédéric FRANCE
a8d8775328
fix doxygen
2021-03-20 10:30:26 +01:00
Frédéric FRANCE
dad7038a0d
fix doxygen
2021-03-20 10:22:34 +01:00
Frédéric FRANCE
49ff44e414
fix doxygen
2021-03-20 10:21:23 +01:00
Frédéric FRANCE
8af1f278ae
fix doxygen
2021-03-20 10:19:03 +01:00
Laurent Destailleur
b5264e978b
Merge pull request #16776 from frederic34/boxticket
...
fix php8 warnings
2021-03-20 10:14:34 +01:00
Frédéric FRANCE
1a2b22def4
fix doxygen
2021-03-20 09:14:52 +01:00
Alexandre SPANGARO
17d3b85ec4
Merge remote-tracking branch 'upstream/develop' into 14a27
2021-03-20 07:47:54 +01:00
Alexandre SPANGARO
00e21caa42
NEW: Add a sub table to manage accountancy on product/company
2021-03-20 07:42:16 +01:00
Frédéric FRANCE
4c5ddc44dc
get conf global function
2021-03-19 17:58:01 +01:00
Frédéric FRANCE
93ae7a3fed
fix php8 warning
2021-03-19 17:01:14 +01:00
Frédéric FRANCE
239dae03bf
fix php8 warnings
2021-03-19 16:57:12 +01:00
Laurent Destailleur
be90f5f2de
Fix id of advanced perm
2021-03-19 15:00:22 +01:00
Laurent Destailleur
8462c4d3d3
Clean menu
2021-03-19 13:37:43 +01:00
Laurent Destailleur
aef2f1713e
FIX #yogosha5673
2021-03-19 13:25:58 +01:00
Laurent Destailleur
ebf409f831
FIX #yogosha5668
2021-03-19 12:08:40 +01:00
stickler-ci
08727a86b0
Fixing style errors.
2021-03-19 10:53:06 +00:00
ptibogxiv
d38f7f7dfe
NEW auto notification with templated emails
2021-03-19 11:50:15 +01:00
Regis Houssin
43e1dbb9ef
FIX avoid php8 warning with multicompany
2021-03-19 11:27:31 +01:00
stickler-ci
ee701bb480
Fixing style errors.
2021-03-19 09:05:20 +00:00
Regis Houssin
a1f6886e97
FIX avoid php8 warning in products list
2021-03-19 10:01:40 +01:00
Frédéric FRANCE
7183bfeb94
fix new boxes add
2021-03-19 09:15:35 +01:00
Laurent Destailleur
b9aacca771
Fix css
2021-03-19 00:04:43 +01:00
Laurent Destailleur
78aec3daae
Removed option MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES. The
...
implmentation did not make any test on subsidiaries. It has same effect
than being an internal user.
2021-03-19 00:00:06 +01:00
Laurent Destailleur
e9f9cf62af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-18 23:59:03 +01:00
Laurent Destailleur
3785346835
Revert " fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject"
2021-03-18 23:57:48 +01:00
Laurent Destailleur
ce4aadba84
Merge branch 'develop' into abb120359
2021-03-18 23:54:27 +01:00
Laurent Destailleur
5ecef1bad3
Merge pull request #16739 from altairisfr/pr_searchbatch
...
NEW Add search on lots or serials into quick search bar
2021-03-18 23:43:23 +01:00
Laurent Destailleur
27c7950417
Fix migration of boxes
2021-03-18 23:39:19 +01:00
Frédéric FRANCE
5b253eeb47
fix the fix
2021-03-18 23:30:42 +01:00
Laurent Destailleur
5037de49c4
Merge pull request #16773 from frederic34/patch-5
...
fix php8 warning
2021-03-18 23:19:32 +01:00
Laurent Destailleur
b66173a111
Merge pull request #16771 from frederic34/projet_task_stats
...
fix php8 warnings
2021-03-18 23:15:37 +01:00
Laurent Destailleur
dc0482e98c
Merge pull request #16774 from frederic34/php8-fix-functionlib
...
fix php8 warnings
2021-03-18 23:13:12 +01:00
Laurent Destailleur
0c882739e3
Merge pull request #16777 from frederic34/patch-8
...
fix php8 warning
2021-03-18 23:10:59 +01:00
Laurent Destailleur
63b78af05f
Merge pull request #16778 from frederic34/patch-9
...
fix php8 warning
2021-03-18 23:10:20 +01:00
Laurent Destailleur
1ecb2ed342
Merge pull request #16780 from frederic34/patch-11
...
fix php8 warning
2021-03-18 23:09:54 +01:00
Laurent Destailleur
a200f6f6ea
Merge pull request #16785 from frederic34/fixextrafieldsadmin
...
fix php8 warning
2021-03-18 23:08:15 +01:00
Laurent Destailleur
319fe108fc
Merge pull request #16811 from frederic34/patch-19
...
fix php8 warning
2021-03-18 22:53:56 +01:00
Laurent Destailleur
f78b4b903d
Merge pull request #16795 from frederic34/patch-18
...
fix php7.4 php8 warning when upgrade reloads modules
2021-03-18 22:53:44 +01:00
Frédéric FRANCE
37fcaf2a57
fix php8 warning
2021-03-18 22:07:35 +01:00
Frédéric FRANCE
b584adf299
fix project replace projet
2021-03-18 21:10:55 +01:00
Frédéric FRANCE
c43d3dff92
fix project replace projet
2021-03-18 20:51:40 +01:00
Frédéric FRANCE
3380f740e5
need to clean glasses
2021-03-18 18:56:28 +01:00
Frédéric FRANCE
f810fffc01
fix php8 wzrning
2021-03-18 18:50:38 +01:00
Florian HENRY
df4a243f18
fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature
2021-03-18 17:13:34 +01:00
Alexandre SPANGARO
18d247026d
NEW: Add a sub table to manage product/societe
2021-03-18 17:08:55 +01:00
Frédéric FRANCE
1b4b48a634
fix php8 warning when upgrade reloads modules
2021-03-18 13:18:50 +01:00
Laurent Destailleur
ac6b6f22e7
Enhance sanitizing of data
2021-03-18 11:39:23 +01:00
Frédéric FRANCE
75cf5e3599
fix php8 warning
2021-03-17 23:55:46 +01:00
Frédéric FRANCE
22ac6c79b3
fix php8 warning
2021-03-17 22:29:33 +01:00
Frédéric FRANCE
00cd4cd953
fix php8 warning
2021-03-17 22:19:40 +01:00
Frédéric FRANCE
da3fcf3ca5
fix php8 warning
2021-03-17 22:16:54 +01:00
Laurent Destailleur
31478d5ac0
Look and feel v14
2021-03-17 22:01:25 +01:00
Frédéric FRANCE
0080d42b66
fix php8 warnings
2021-03-17 21:49:05 +01:00
Laurent Destailleur
35869f1449
Add function dol_string_onlythesehtmlattributes() and option
...
MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to enable it.
2021-03-17 21:39:28 +01:00
Frédéric FRANCE
9609c3095a
fix php8 warnings
2021-03-17 20:13:20 +01:00
Frédéric FRANCE
fced63e93b
fix php8 warning
2021-03-17 20:11:22 +01:00
Frédéric FRANCE
efaa2be3b8
fix php8 warnings
2021-03-17 18:38:24 +01:00
Laurent Destailleur
24576897ef
Merge pull request #16750 from frederic34/restrictiononfksoc
...
fix php8 warnings
2021-03-17 17:05:23 +01:00
Laurent Destailleur
8829d42e1d
Merge pull request #16742 from frederic34/fix-php8-20210306
...
Fix php8
2021-03-17 16:58:05 +01:00
Laurent Destailleur
09f8ccd882
Merge pull request #16753 from frederic34/patch-12
...
fix php8 warning
2021-03-17 16:56:10 +01:00
Laurent Destailleur
36cb213a83
Merge pull request #16764 from hregis/fix_php_8_warning_again
...
FIX avoid php 8.x warning
2021-03-17 16:50:21 +01:00
Laurent Destailleur
33c3b9d1a3
Merge pull request #16763 from hregis/fix_avoid_php_8_warning
...
FIX avoid php 8 warning
2021-03-17 16:50:08 +01:00
Regis Houssin
4d149dc3fe
FIX avoid php 8.x warning
2021-03-17 15:15:51 +01:00
Regis Houssin
5fc40f2b12
FIX avoid php 8 warning
2021-03-17 14:32:25 +01:00
Regis Houssin
bb4c8d9114
FIX avoid warning with php 8
2021-03-17 12:48:59 +01:00
Laurent Destailleur
8de1b4c94e
Factorize code
2021-03-17 11:34:19 +01:00
Frédéric FRANCE
dde51a23f0
fix php8 warning
...
sometimes $size == '' and cause warnings later in the code
2021-03-16 22:01:59 +01:00
Frédéric FRANCE
4e8ea5c07e
fix php8 warnings
2021-03-16 21:13:15 +01:00
Frédéric FRANCE
e1ad7013d9
fix php8
2021-03-16 17:47:24 +01:00
Christophe Battarel
f59c19b573
search on lots or serials
2021-03-16 16:50:59 +01:00
Laurent Destailleur
e366d2c379
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
2021-03-16 14:50:06 +01:00
Bahfir Abbes
9c51e62d0f
Update security.lib.php
...
MAIN_EXTERNAL_USERS_CAN_SEE_SUBSIDIARY_COMPANIES
2021-03-16 12:25:17 +01:00
Laurent Destailleur
017120f017
Merge pull request #16697 from frederic34/patch-3
...
fix syntax
2021-03-16 10:42:49 +01:00
Laurent Destailleur
71e7f10a54
FIX #16698
2021-03-16 10:39:10 +01:00
Laurent Destailleur
87ab711a0f
Merge pull request #16707 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-16 10:34:55 +01:00
Laurent Destailleur
a357ab0ee7
Merge pull request #16708 from frederic34/patch-4
...
fix php8 warning
2021-03-16 10:34:02 +01:00
Laurent Destailleur
897f4be033
Merge pull request #16712 from frederic34/patch-9
...
fix php8 warnings
2021-03-16 10:33:01 +01:00
Laurent Destailleur
401aeb8a7f
Merge pull request #16706 from frederic34/htmlforcc
...
decompose code
2021-03-16 10:32:44 +01:00
Laurent Destailleur
462164a5a8
Merge pull request #16709 from frederic34/patch-5
...
fix php8 warnings
2021-03-16 10:31:53 +01:00
Florian HENRY
9d8254eff4
fix price output in commoncard
2021-03-16 09:59:45 +01:00
Alexandre SPANGARO
6e17a588bb
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-16 03:26:28 +01:00
Frédéric FRANCE
2d741a33f0
fix php8 warning
2021-03-15 21:03:54 +01:00
Frédéric FRANCE
f7d43ce4fb
fix php8 warnings
2021-03-15 20:55:59 +01:00
Frédéric FRANCE
a0e6f454ff
fix php8 warnings
2021-03-15 20:31:55 +01:00
Frédéric FRANCE
c437b2d5c9
fix php8 warning
...
Undefined property: stdClass::$fin_validite
Undefined property: stdClass::$date_cloture
$dateterm, $dateclose, $late not used
2021-03-15 20:28:37 +01:00
Florian HENRY
177a6bfe4f
conference or booth card and list ok
2021-03-15 20:20:53 +01:00
Frédéric FRANCE
e89cfc3753
decompose code
2021-03-15 20:17:01 +01:00
Frédéric FRANCE
910b4f1daf
Update html.formmail.class.php
2021-03-15 18:58:35 +01:00
Frédéric FRANCE
dd4b8f2880
Update html.formmail.class.php
2021-03-15 18:22:50 +01:00
Florian HENRY
17c49e6ce9
ongoinf card and list
2021-03-15 18:06:23 +01:00
Laurent Destailleur
1e323b302e
Merge pull request #16684 from frederic34/patch-3
...
fix php8 warning
2021-03-15 17:14:42 +01:00
Laurent Destailleur
a8c34a5b05
Invert MAIN_EXTRAFIELDS_USE_SELECT2 into
...
MAIN_EXTRAFIELDS_DISABLE_SELECT2
2021-03-15 14:16:55 +01:00
Frédéric FRANCE
d4eecf3eb2
fix php8 warning
2021-03-15 13:51:54 +01:00
Laurent Destailleur
3964801d40
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2021-03-15 13:26:20 +01:00
Laurent Destailleur
2129adf129
Add more fields to llx_oauth_token
2021-03-15 13:25:08 +01:00
Laurent Destailleur
85eaec48e1
Merge pull request #16307 from aspangaro/14a15
...
NEW: VAT report - Optimisation & collapse by rate
2021-03-15 11:56:06 +01:00
Christophe Battarel
090dc4f28a
Merge branch 'develop' into pr_batch_masks
2021-03-15 11:42:33 +01:00
Laurent Destailleur
7d1e18f5ab
Merge pull request #16625 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-15 11:37:57 +01:00
Frédéric FRANCE
15c751ae89
Merge remote-tracking branch 'upstream/develop' into php8-fix
2021-03-15 11:18:41 +01:00
Laurent Destailleur
21400b96fa
Merge pull request #16656 from frederic34/patch-11
...
remove dol_buildpath
2021-03-15 11:08:01 +01:00
Laurent Destailleur
007201ea64
Merge pull request #16662 from frederic34/patch-17
...
fix php8 warning
2021-03-15 11:06:38 +01:00
Laurent Destailleur
7b61f756f8
Merge pull request #16659 from frederic34/patch-14
...
fix php8 warnings
2021-03-15 11:05:53 +01:00
Laurent Destailleur
b7c7bd8d94
Merge pull request #16666 from frederic34/patch-21
...
fix php8 warning
2021-03-15 11:03:20 +01:00
Laurent Destailleur
57f9607e3e
Update accounting.lib.php
2021-03-15 11:01:01 +01:00
Laurent Destailleur
e7205a4f79
Merge pull request #16677 from frederic34/patch-31
...
fix php8 warning
2021-03-15 10:55:01 +01:00
Laurent Destailleur
26e8a9c795
Code comment
2021-03-15 10:08:02 +01:00
Frédéric FRANCE
e8b994ece5
fix php8 warning
2021-03-15 00:40:10 +01:00
Laurent Destailleur
382b810ba1
Fix phpcs
2021-03-15 00:18:26 +01:00
Laurent Destailleur
1d2929e3f5
Clean code
2021-03-15 00:01:55 +01:00
Frédéric FRANCE
abd9a639a2
fix php8 warning
2021-03-14 23:41:06 +01:00
Laurent Destailleur
9aa8916a9c
Disallow use of &# into dol_sanitizeUrl()
2021-03-14 20:35:55 +01:00
Frédéric FRANCE
bbb0d9acc4
fix php8 warning
2021-03-14 20:31:13 +01:00
Laurent Destailleur
45579edd43
Enhance WAF and dol_sanitizeUrl
2021-03-14 18:57:18 +01:00
Frédéric FRANCE
0cbf57327b
fiw php8 warnings
2021-03-14 18:18:21 +01:00
Frédéric FRANCE
220b1539f7
Update cron.lib.php
2021-03-14 17:36:27 +01:00
Laurent Destailleur
c2a86e71be
fix phpv8
2021-03-14 16:44:11 +01:00
Laurent Destailleur
4965ce8768
Fix method to sanitize an URL
2021-03-14 16:14:24 +01:00
Laurent Destailleur
74a61d559f
FIX sanitizing with GETPOST(alphanohtml) #yogosha5629
2021-03-14 15:39:59 +01:00
Laurent Destailleur
72766c830d
FIX #Yogosha5631
2021-03-14 15:06:40 +01:00
Laurent Destailleur
95006ec94c
Fix sanitizing backtopage
2021-03-14 12:58:37 +01:00
Laurent Destailleur
cc10106a21
Fix protection on int
2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7
Fix yogosha #5627
2021-03-14 11:48:39 +01:00
Laurent Destailleur
0a542ad9f9
Fix redirect to external website. Bad sanitizing of backtopage parameter
2021-03-14 11:38:42 +01:00
Laurent Destailleur
bcfe711544
Fix redirect to extern url
2021-03-13 19:20:34 +01:00
Laurent Destailleur
5faecef0e1
Look and feel v14
2021-03-13 18:56:02 +01:00
Frédéric FRANCE
c3c03e9de3
fix php8 fatal error
2021-03-13 18:42:50 +01:00
Laurent Destailleur
0dfe79e619
CSS
2021-03-13 14:10:07 +01:00
Laurent Destailleur
8c6fe6f29b
Merge pull request #16638 from frederic34/patch-5
...
go back actioncomm create after create project
2021-03-12 20:19:30 +01:00
Laurent Destailleur
aa26f873ff
Merge pull request #16634 from mrtnnbr/develop
...
Add UPC support to built-in barcode generator
2021-03-12 20:16:45 +01:00
stickler-ci
f507df994b
Fixing style errors.
2021-03-12 18:07:16 +00:00
Frédéric FRANCE
6be6e306b1
Update interface_50_modEventOrganization_EventOrganization.class.php
2021-03-12 19:05:03 +01:00
Laurent Destailleur
af5db0f5fa
Look and feel v14
2021-03-12 15:34:31 +01:00
Martin Neubauer
85eb82c8c3
Tweak offsets for UPC barcode text
2021-03-12 14:44:04 +01:00
Christophe Battarel
c339af533d
fix conflict
2021-03-12 14:15:55 +01:00
Martin Neubauer
0db65597fd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2021-03-12 13:58:00 +01:00
Martin Neubauer
09cedb5a5e
ISBN might start with 979 these days
2021-03-12 13:55:39 +01:00
Martin Neubauer
5aaeb6742c
Add UPC support to built-in barcode generator
2021-03-12 13:54:27 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant
2021-03-12 13:14:53 +01:00
Martin Neubauer
7b59a3ac2b
Factor out generating EAN bars
2021-03-12 13:11:17 +01:00
Laurent Destailleur
777ba369c4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-12 12:44:25 +01:00
Laurent Destailleur
f9918dd51f
Code comment
2021-03-12 11:50:48 +01:00
Laurent Destailleur
aee3fda3d1
Merge pull request #16280 from bafbes/abb120358
...
New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users
2021-03-12 11:14:31 +01:00
Regis Houssin
5375add08c
FIX just add mp4
2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0
FIX wrong extension
2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7
FIX missing video mime
2021-03-12 08:35:13 +01:00
Florian HENRY
f17aa47ad6
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft
2021-03-11 22:03:51 +01:00
Laurent Destailleur
fc08c48bf3
Merge pull request #16591 from Givriz/dev
...
Replace gender and civility by a picto
2021-03-11 21:36:16 +01:00
Laurent Destailleur
b7a66769bb
Merge pull request #16603 from FHenry/dev_EventOrganisation
...
new: working on conference or booth object and event type #FoundationFunding
2021-03-11 21:35:39 +01:00
Laurent Destailleur
e8bbef8d2d
Update interface_50_modEventOrganization_EventOrganization.class.php
2021-03-11 21:35:22 +01:00
Florian HENRY
862926316a
working on list
2021-03-11 19:09:42 +01:00
Damien BENOIT
420a3a73dd
Update html.form.class.php
2021-03-11 18:15:22 +01:00
Florian HENRY
3ae93679cf
Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_draft
2021-03-11 16:59:13 +01:00
Florian HENRY
6742241639
better tranaction and condition
2021-03-11 16:55:49 +01:00
stickler-ci
345fe648b3
Fixing style errors.
2021-03-11 15:37:27 +00:00
Laurent Destailleur
c596eb91a8
Merge branch 'develop' into abb120358
2021-03-11 16:35:21 +01:00
Christophe Battarel
229c581a25
try to fix sticker
2021-03-11 11:30:12 +01:00
Christophe Battarel
e8aacc7acf
try to fix sticker
2021-03-11 11:12:03 +01:00
Christophe Battarel
ba51c5dc70
differentiate masks for lot management and serial numbers management
2021-03-11 10:44:55 +01:00
lmarcouiller
9aa20585be
Fix #16617 : fix event add when removing boxes
2021-03-11 10:10:20 +01:00
Christophe Battarel
2c711f1a2d
add masks for batch
2021-03-11 10:02:31 +01:00
Bahfir Abbes
0158cbb893
Update security.lib.php
2021-03-11 04:02:30 +01:00
Laurent Destailleur
3007141b2b
Fix phpcs
2021-03-10 20:40:34 +01:00
Laurent Destailleur
82d5c7289d
Add property widgettype
2021-03-10 17:02:39 +01:00
Damien BENOIT
2b33bb2d04
Merge pull request #11 from Dolibarr/develop
...
Update fork
2021-03-10 16:53:35 +01:00
Laurent Destailleur
521e3b20dc
Rename widget
2021-03-10 16:44:46 +01:00
Damien BENOIT
93675082d7
Update html.form.class.php
2021-03-10 16:42:14 +01:00
Laurent Destailleur
c2200e6ffd
Clean code
2021-03-10 16:41:48 +01:00
Givriz
6e46396b17
Ajout de picto pour le genre et la civilité
2021-03-10 16:31:50 +01:00
Laurent Destailleur
514a9fb96a
Merge pull request #16561 from Hystepik/develop#1
...
Close #15917 : Improvement to ticket module
2021-03-10 15:49:20 +01:00
Laurent Destailleur
9ed128c6fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/class/html.formaccounting.class.php
htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
htdocs/langs/en_US/errors.lang
htdocs/product/card.php
2021-03-10 15:35:09 +01:00
Laurent Destailleur
680f6257a0
FIX warning if setup of chart of account is not yet done.
2021-03-10 11:04:28 +01:00
Laurent Destailleur
b1f4c29fde
Fix missing alias
2021-03-09 20:12:14 +01:00
Florian HENRY
7aec2fc02b
create task
2021-03-09 18:52:52 +01:00
Laurent Destailleur
b778820fe2
Merge pull request #16596 from FHenry/dev_allowAliasInCommonObject_GetFiledList
...
Dev allow alias in common object get filed list
2021-03-09 16:54:22 +01:00
Laurent Destailleur
9cb4dce485
Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing
2021-03-09 16:12:30 +01:00
Laurent Destailleur
1fe90091b6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-09 15:35:25 +01:00
Laurent Destailleur
cf30e90b93
Work on inventory
2021-03-09 15:35:10 +01:00
Laurent Destailleur
3cb072f67a
Update commonobject.class.php
2021-03-09 15:13:20 +01:00
Laurent Destailleur
b822f04cbb
Merge pull request #16593 from frederic34/patch-3
...
fix unknown variable
2021-03-09 15:08:11 +01:00
Laurent Destailleur
1b3aae1984
Fix regression
2021-03-09 12:17:32 +01:00
Laurent Destailleur
53f8ff060a
Fix phpcs
2021-03-09 10:40:22 +01:00
Florian HENRY
ce5324c08c
Merge HEAD, branch 'develop' of https://github.com/Dolibarr/dolibarr into dev_allowAliasInCommonObject_GetFiledList
2021-03-09 10:24:07 +01:00
Florian HENRY
bcbf8bb72a
allow table alias into commonObject getFieldList
2021-03-09 10:21:32 +01:00
Frédéric FRANCE
de1cf54e2f
Update box_members_by_type.php
2021-03-09 00:20:28 +01:00
Laurent Destailleur
c3a047ee06
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
2021-03-08 19:31:47 +01:00
Laurent Destailleur
2f0c4038fb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/comm/action/class/api_agendaevents.class.php
htdocs/compta/sociales/card.php
htdocs/societe/consumption.php
2021-03-08 19:27:34 +01:00
Laurent Destailleur
3b80b9dd75
Fix regression
2021-03-08 16:37:52 +01:00
Laurent Destailleur
a79a4e876d
Merge branch 'develop' into boxindex
2021-03-08 16:34:05 +01:00
Laurent Destailleur
24a0700426
Merge pull request #16573 from frederic34/box_index_societe
...
can add box on thirparties index
2021-03-08 16:25:46 +01:00
Laurent Destailleur
1aba0c2bc9
NEW Can set order of execution of hooks
2021-03-08 15:56:41 +01:00
lmarcouiller
b71a8c5d6f
Close #15917 : boxes on ticket index
2021-03-08 15:26:35 +01:00
lmarcouiller
d8a74bad93
update for continuous integration
2021-03-08 13:58:23 +01:00
lmarcouiller
8c7764ed5d
Move of 2 graph in boxes
2021-03-08 12:18:55 +01:00
Laurent Destailleur
ab89d85095
Fix for php8
2021-03-08 11:33:07 +01:00
ksar
ec8baa6bff
Update commondocgenerator.class.php
...
#16341
2021-03-08 10:00:19 +01:00
Alexandre SPANGARO
2f86971f84
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-08 09:56:57 +01:00
Frédéric FRANCE
92754760f4
can add box on thirparties index
2021-03-06 16:38:07 +01:00
Laurent Destailleur
0a0bb92689
Fix phpcs
2021-03-06 11:37:23 +01:00
Laurent Destailleur
315e66aa5a
Merge pull request #16537 from altairisfr/pr_sn_unicity
...
Unique serial number management
2021-03-06 11:22:44 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0
...
fix: set class attribute at right place
2021-03-06 11:18:02 +01:00
Laurent Destailleur
cbd6357f45
Merge pull request #16556 from marc-dll/NEW_ldap_group_filter
...
NEW: LDAP: usergroup search can be filtered
2021-03-06 11:08:24 +01:00
Laurent Destailleur
0816cb9c04
Merge pull request #16560 from code-chicken/patch-12
...
Don't discard previously collected data
2021-03-06 10:57:18 +01:00
Laurent Destailleur
3cbced439a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/listevents.php
htdocs/compta/bank/line.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/paiement/cheque/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/ticket.lib.php
htdocs/core/modules/mailings/modules_mailings.php
htdocs/core/tpl/extrafields_view.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/cron/list.php
htdocs/expedition/card.php
htdocs/mrp/mo_list.php
htdocs/product/stock/productlot_card.php
htdocs/public/emailing/mailing-read.php
htdocs/public/emailing/mailing-unsubscribe.php
htdocs/ticket/list.php
test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
98c7814fa3
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-03-05 18:28:15 +01:00
Laurent Destailleur
1cd822bd75
Fix DOS attack on emailings wrappers
2021-03-05 14:54:17 +01:00
Rüdiger Hahn
18fc169cd0
Don't discard previously collected data
...
For keeping all previously collected data (i.e. company_... values), one has to merge the array but not to assign a new one.
2021-03-05 11:32:03 +01:00
stickler-ci
06cabb35ec
Fixing style errors.
2021-03-05 10:24:28 +00:00
Marc de Lima Lucio
396fb3fae3
FIX: ldap: bad function comment
2021-03-05 11:21:04 +01:00
Marc de Lima Lucio
f731545af4
NEW: ldap: filter search on usergroups
2021-03-05 11:14:21 +01:00
Laurent Destailleur
83df996bc2
Fix english translation
2021-03-05 09:52:25 +01:00
Florian HENRY
6de6782458
fix: set class at right place
2021-03-05 08:41:04 +01:00
Laurent Destailleur
6eafc3b774
Clean code
2021-03-04 17:23:12 +01:00
Laurent Destailleur
7d20df8054
Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries
...
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
2021-03-04 16:53:54 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0
...
avoid warning into modulebuilder
2021-03-04 16:52:47 +01:00
Laurent Destailleur
beb8dbcc01
Update project.lib.php
2021-03-04 16:48:25 +01:00
Laurent Destailleur
dcff298c5f
FIX #16533
2021-03-04 15:57:03 +01:00
Christophe Battarel
53cf042a57
adapt tobatch import/export
2021-03-04 15:35:53 +01:00
Laurent Destailleur
98eb0fc969
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391
FIX Timezone management for datetime on list of events
2021-03-04 15:34:29 +01:00
atm-greg
c41b59b14c
Fix : when we have got models in database attached files are cleared even if we did not have selected a model
2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0
Fix: lost selecteds items in ticket creation
2021-03-04 11:50:46 +01:00
stickler-ci
47dd477c61
Fixing style errors.
2021-03-04 09:36:17 +00:00
lmarcouiller
e94f703f5d
Fix #16523 : return to backward compatibility
2021-03-04 10:33:18 +01:00
Laurent Destailleur
7bc2e1ffad
FIX Timezone management for datetime with modulebuilder and extrafields
2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6
avoid warning into modulebuilder
2021-03-04 10:28:41 +01:00
lmarcouiller
500f192a05
Fix #16523 : New column Contact assigned
2021-03-04 10:15:41 +01:00
Laurent Destailleur
5553bae3a1
FIX Timezone management for datetime with modulebuilder
2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781
FIX Timezone management for datetime with modulebuilder
2021-03-04 09:36:19 +01:00
Laurent Destailleur
aa1551bf1f
FIX class not found when creating recuring invoice from invoice+discount
2021-03-03 22:46:25 +01:00
Laurent Destailleur
43e58f70a1
Merge pull request #16528 from frederic34/patch-4
...
remove unused code
2021-03-03 15:10:58 +01:00
Laurent Destailleur
d22f929779
Merge pull request #16526 from frederic34/patch-3
...
fix unknown constant and variable
2021-03-03 15:10:38 +01:00
Alexandre SPANGARO
59a2fb8ed5
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-03-03 14:08:40 +01:00
Frédéric FRANCE
d05c0b749a
remove unused code
2021-03-03 13:11:10 +01:00
Frédéric FRANCE
2d9f00eb57
Update commonobject.class.php
2021-03-03 12:24:44 +01:00
Laurent Destailleur
da8b67da83
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-03-03 12:07:42 +01:00
Laurent Destailleur
5f8b52ffc9
Code comment
2021-03-03 12:05:43 +01:00
Laurent Destailleur
093eab188e
Code comment
2021-03-03 12:02:57 +01:00
Frédéric FRANCE
a8bf47b9ce
fix unknown constant and variable
2021-03-03 12:02:48 +01:00
Laurent Destailleur
f11a85a3e3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/card.php
htdocs/compta/facture/card.php
htdocs/contrat/card.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
2021-03-03 11:37:34 +01:00
Laurent Destailleur
889a496661
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-03 11:31:55 +01:00
Laurent Destailleur
b5d1e36ece
Fix include
2021-03-03 11:31:40 +01:00
Laurent Destailleur
6fcec3e99b
Merge pull request #16522 from FHenry/13.0
...
fix: warning on install
2021-03-02 23:58:26 +01:00
Laurent Destailleur
c2f0d9f42c
Update functions.lib.php
2021-03-02 23:57:37 +01:00
Laurent Destailleur
7abf572f2d
Merge pull request #16512 from Hystepik/develop#1
...
Fix #16432 : Update of getCountriesinEEC
2021-03-02 23:56:37 +01:00
Laurent Destailleur
348b8d2ffe
More phpunit tests
2021-03-02 23:55:41 +01:00
Florian HENRY
4e5849e50b
remove debug
2021-03-02 23:13:05 +01:00
Laurent Destailleur
7eb3e324c7
FIX #16503
2021-03-02 23:09:55 +01:00
Florian HENRY
30c6e268a1
fix warning
2021-03-02 22:55:43 +01:00
Frédéric FRANCE
22bc3b879b
new box replace
2021-03-02 22:21:34 +01:00
Frédéric FRANCE
d68de8617b
new box replace
2021-03-02 22:00:09 +01:00
Frédéric FRANCE
742c12f9d6
rename new boxes
2021-03-02 20:58:21 +01:00
Frédéric FRANCE
6cf8a46095
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 20:41:01 +01:00
lvessiller
66ad8fbb24
FIX select list dependancies on common object ( FIX #16510 )
2021-03-02 17:21:55 +01:00
lmarcouiller
2eaa6ad6c6
Fix #16432 : Add cache use in function
2021-03-02 16:21:43 +01:00
Laurent Destailleur
c81d5ff4d0
Introduce a variable to cache some data.
2021-03-02 16:13:00 +01:00
stickler-ci
b374a8a00b
Fixing style errors.
2021-03-02 15:03:36 +00:00
lmarcouiller
fc86784cfc
Fix #16432 : update with eldy advices
2021-03-02 16:03:14 +01:00
Laurent Destailleur
8fc89b9ef1
Merge pull request #16511 from FHenry/13.0
...
fix #16510 (missing ($this->) in previous PR
2021-03-02 15:49:13 +01:00
Laurent Destailleur
7f1d61f8a8
Fix phpcs
2021-03-02 15:34:43 +01:00
Florian HENRY
373d52a562
Merge remote-tracking branch 'origin/13.0' into 13.0
2021-03-02 15:33:38 +01:00
Laurent Destailleur
a5bcc47d0d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-02 15:29:54 +01:00
Laurent Destailleur
a82ad6a02c
Fix phpcs
2021-03-02 15:29:27 +01:00
Laurent Destailleur
42329b10c9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
build/generate_filelist_xml.php
htdocs/comm/propal/card.php
htdocs/commande/card.php
htdocs/compta/facture/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/modulebuilder.lib.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/supplier_proposal/card.php
htdocs/ticket/list.php
2021-03-02 15:27:20 +01:00
lmarcouiller
c5ac79e34c
Fix #16432 : Update of getCountriesinEEX
2021-03-02 15:24:55 +01:00
Florian HENRY
2c163b8163
fix #16510
2021-03-02 15:22:22 +01:00
Laurent Destailleur
495c61c231
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
2021-03-02 15:12:41 +01:00
Laurent Destailleur
5fd341bbd3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2021-03-02 15:11:18 +01:00
Laurent Destailleur
1f25f2bb7e
Fix phpcs
2021-03-02 15:09:29 +01:00
Laurent Destailleur
cdfb9254b3
Merge pull request #16510 from FHenry/13.0_fix_missing_list_dependencies_for_modulebuilder_fields
...
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:51:53 +01:00
Laurent Destailleur
3982a36a3e
Update commonobject.class.php
2021-03-02 14:47:35 +01:00
Laurent Destailleur
7144e80063
Merge pull request #16322 from FHenry/dev_new_conf_defaulteventstatus
...
NEW: Conf for default actiomm status when created from card (and DefaultValues CRUD class)
2021-03-02 14:45:05 +01:00
Florian HENRY
27c354567a
FIX : select list dependencies now work for ModuleBuilder sellist field
2021-03-02 14:06:11 +01:00
Laurent Destailleur
acb7b30eb0
Merge pull request #16507 from frederic34/add_rule
...
Add rule
2021-03-02 12:52:03 +01:00
Laurent Destailleur
1132ed306c
Merge pull request #16506 from andreubisquerra/patch-1
...
Avoid php errors if negative var in Receipt Module
2021-03-02 12:50:57 +01:00
Frédéric FRANCE
e1ff1c736c
fix typo
...
Conflicts:
htdocs/core/login/functions_openid.php
2021-03-02 12:41:34 +01:00
Laurent Destailleur
25b2de4874
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-03-02 12:40:00 +01:00
Laurent Destailleur
ba04c94b2d
Merge pull request #16502 from frederic34/patch-3
...
fix typo
2021-03-02 12:39:26 +01:00
Laurent Destailleur
ef99b0f98c
Update modulebuilder.lib.php
2021-03-02 12:38:17 +01:00
Laurent Destailleur
a161edefb1
Look and feel v14
2021-03-02 12:33:55 +01:00
Florian HENRY
812d3279b3
Merge branch 'dev_new_conf_defaulteventstatus' of github.com:FHenry/dolibarr into dev_new_conf_defaulteventstatus
2021-03-02 11:06:52 +01:00
Florian HENRY
0f7144a391
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-02 11:05:20 +01:00
Florian HENRY
593ae78761
avoid php wrning
2021-03-02 10:55:23 +01:00
Frédéric FRANCE
cb507a61b9
backup with utf8mb4
2021-03-02 09:54:52 +01:00
Laurent Destailleur
7f209f7cc7
Clean code
2021-03-02 02:55:24 +01:00
Laurent Destailleur
cffea1889f
FIX #16325
2021-03-02 01:17:28 +01:00
Laurent Destailleur
f1f950e8b7
Close #16395 - Can filter on proposal source in list
2021-03-02 00:11:15 +01:00
Frédéric FRANCE
3b428004d8
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-02 00:09:44 +01:00
andreubisquerra
5bb7c521aa
Update dolreceiptprinter.class.php
2021-03-01 23:30:38 +01:00
andreubisquerra
15cc0f8775
Avoid php errors if negative var in Receipt Module
...
Solved in develop branch with PR https://github.com/Dolibarr/dolibarr/pull/15994/files
After testing we introduce it in version 13
2021-03-01 23:09:07 +01:00
Frédéric FRANCE
f2cdbf6bb2
Merge remote-tracking branch 'upstream/develop' into add_rule
2021-03-01 21:22:34 +01:00
stickler-ci
54d35fa59f
Fixing style errors.
2021-03-01 20:00:32 +00:00
Florian HENRY
32ef55cd9e
working default status/percent for event actioncomm
2021-03-01 20:58:02 +01:00
Frédéric FRANCE
a4e25359e7
add missing rule
2021-03-01 20:37:16 +01:00
Florian HENRY
f62386a6a5
set Default values as CURD classes
2021-03-01 20:36:42 +01:00
Florian HENRY
1b57d2a4a0
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_new_conf_defaulteventstatus
2021-03-01 19:57:54 +01:00
Florian HENRY
7d3bd131ab
default envent status
2021-03-01 19:54:30 +01:00
Florian HENRY
0edae6e19a
add class default values
2021-03-01 18:25:23 +01:00
Frédéric FRANCE
eb62750aab
fix typo
2021-03-01 18:06:03 +01:00
Laurent Destailleur
1cdea45707
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/societe/canvas/company/tpl/card_create.tpl.php
htdocs/societe/canvas/individual/tpl/card_create.tpl.php
htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
stickler-ci
d20ba5a665
Fixing style errors.
2021-03-01 15:38:15 +00:00
Gauthier PC portable 024
861b583668
FIX : handling $heightforinfotot when he's superior to a page height on Supplier Invoice
2021-03-01 16:34:42 +01:00
Laurent Destailleur
222012da37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/paymentvarious.class.php
htdocs/compta/bank/various_payment/card.php
htdocs/don/card.php
htdocs/langs/en_US/main.lang
htdocs/public/payment/newpayment.php
test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Laurent Destailleur
b2cfc431bc
Merge pull request #16489 from aspangaro/13p7
...
FIX: Total_ht not show in contract link element
2021-03-01 14:07:29 +01:00
Frédéric FRANCE
8c45137b37
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-03-01 12:55:45 +01:00
Gauthier PC portable 024
6da28f5e44
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-03-01 11:12:03 +01:00
Alexandre SPANGARO
94a861c1c8
Code enhanced - Standardize field name
2021-03-01 04:07:31 +01:00
Alexandre SPANGARO
e35379a95d
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-03-01 03:20:25 +01:00
Alexandre SPANGARO
0d954cb1c7
FIX: Total_ht not show in contract link element
2021-03-01 03:09:36 +01:00
Frédéric FRANCE
1b046f25cf
add new rule
2021-03-01 00:19:52 +01:00
Laurent Destailleur
490faec547
FIX Timezone problems
...
Conflicts:
htdocs/core/lib/date.lib.php
test/phpunit/DateLibTest.php
2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c
FIX Timezone problems
2021-02-28 22:44:11 +01:00
Alexandre SPANGARO
de241eced3
FIX: Total_ht not show in contract link element
2021-02-28 22:22:20 +01:00
Laurent Destailleur
a6bc218280
Look and feel v14
2021-02-28 21:34:27 +01:00
Alexandre SPANGARO
706aad3b68
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 21:33:59 +01:00
Alexandre SPANGARO
7a3dfda8ee
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 21:30:25 +01:00
Laurent Destailleur
6294ae61a8
Look and feel v14
2021-02-28 14:26:32 +01:00
Laurent Destailleur
886cbc61c8
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/boxes/box_factures_fourn.php
htdocs/core/boxes/box_factures_fourn_imp.php
htdocs/core/boxes/box_ficheinter.php
htdocs/core/boxes/box_members.php
htdocs/core/boxes/box_propales.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/functions.lib.php
htdocs/fourn/class/fournisseur.facture.class.php
2021-02-28 13:37:45 +01:00
Laurent Destailleur
2a3b3753a8
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-28 13:27:38 +01:00
Laurent Destailleur
0bb304ec33
Merge pull request #16473 from frederic34/patch-3
...
fix variable name
2021-02-28 13:25:20 +01:00
Laurent Destailleur
1149de1aca
FIX #16485
2021-02-28 13:15:24 +01:00
Laurent Destailleur
3a19cbb062
FIX #16420 #16423 #16488 #16477
2021-02-28 12:47:24 +01:00
Laurent Destailleur
0832c25b5b
Look and feel v14
2021-02-28 11:48:35 +01:00
Alexandre SPANGARO
ca7958f273
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-28 07:32:23 +01:00
Alexandre SPANGARO
ad95caac7e
Merge branch 'develop' into 14a15
2021-02-28 07:12:24 +01:00
Alexandre SPANGARO
6e1d67084d
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-28 07:09:30 +01:00
Laurent Destailleur
753b1d1e11
FIX status on tooltip on widgets
2021-02-27 19:43:56 +01:00
Laurent Destailleur
4cf2d2317f
FIX Status in popup of member in widget
2021-02-27 19:16:14 +01:00
Laurent Destailleur
7dace2f459
Show 3 years in graph of widget by default.
2021-02-27 18:38:32 +01:00
Laurent Destailleur
9cf4222d3a
Look and feel v14
2021-02-27 17:15:40 +01:00
Laurent Destailleur
5c0ea476e1
Look and feel v14
2021-02-27 12:45:07 +01:00
Frédéric FRANCE
8bfa7565bd
Update commonobject.class.php
2021-02-27 08:52:40 +01:00
Frédéric FRANCE
2cc635fd09
FIX https://github.com/Dolibarr/dolibarr/issues/16465
2021-02-27 08:00:02 +01:00
Laurent Destailleur
34d00e5d5e
Look and feel v14
2021-02-27 02:44:52 +01:00
Laurent Destailleur
8e632d08b8
NEW Add link picto to the stock movement on the detail of production
2021-02-27 00:31:29 +01:00
Frédéric FRANCE
5d4004d3f4
fix cache
2021-02-26 23:06:33 +01:00
Frédéric FRANCE
94aa116fa8
fix variable name
2021-02-26 23:01:18 +01:00
Laurent Destailleur
e7da1d7fe4
FIX #16431
2021-02-26 19:38:18 +01:00
Laurent Destailleur
dd72a52e8f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/balancebymonth.php
htdocs/accountancy/class/accountancyexport.class.php
2021-02-26 19:23:23 +01:00
Laurent Destailleur
81c2ae325b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-26 19:20:32 +01:00
Laurent Destailleur
d5566dbf8f
FIX #16431
2021-02-26 19:18:03 +01:00
Frédéric FRANCE
96b0f3a25c
code syntax directory
2021-02-26 16:19:52 +01:00
Gauthier PC portable 024
e598b49545
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 15:33:36 +01:00
Laurent Destailleur
5095e7f927
Merge pull request #16124 from hregis/fix_avoid_missing_url_and_token
...
Fix avoid missing url and token
2021-02-26 15:21:56 +01:00
Laurent Destailleur
5d0a0fe341
Clean code
2021-02-26 14:53:16 +01:00
Laurent Destailleur
a5925cc2cb
Merge branch 'develop' into count_project_head
2021-02-26 13:02:54 +01:00
Laurent Destailleur
f5406d487b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/product.lib.php
htdocs/product/stock/productlot_card.php
test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
16906abc09
FIX File attachment on lots
2021-02-26 12:47:57 +01:00
Laurent Destailleur
34ed5519fd
Merge pull request #16435 from altairisfr/batchevents_pr
...
add event management to batch products
2021-02-26 11:50:48 +01:00
Gauthier PC portable 024
c996871f98
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-26 11:50:18 +01:00
Laurent Destailleur
634d94b0b7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-26 11:27:27 +01:00
Laurent Destailleur
0f44bdb90f
Fix sql error
2021-02-26 11:27:03 +01:00
Laurent Destailleur
adc0313543
Fix lang
2021-02-26 11:09:15 +01:00
Laurent Destailleur
2670d4fc17
Look and feel v14
2021-02-26 11:00:58 +01:00
Laurent Destailleur
aba43b3e35
Fix init before
2021-02-26 10:44:52 +01:00
Laurent Destailleur
67db1d4937
Merge pull request #16427 from dvdwalker/ajax-fix
...
Fix: Option MAIN_DIRECT_STATUS_UPDATE broken. Ajax on/off not saving value in DB after updating to version >=12
2021-02-26 10:39:58 +01:00
Laurent Destailleur
cec9c65ab8
Merge pull request #16449 from daraelmin/daraelmin-patch-3
...
Fix #16420 undefined $model_mail_selected_id
2021-02-26 10:33:56 +01:00
Laurent Destailleur
e7ae2e65d7
Update html.formmail.class.php
2021-02-26 10:33:49 +01:00
Laurent Destailleur
e0785ac5ef
Update html.formmail.class.php
2021-02-26 10:31:02 +01:00
Laurent Destailleur
69c974800c
Update html.formmail.class.php
2021-02-26 10:30:30 +01:00
Laurent Destailleur
7b70d4b1de
Merge pull request #16415 from frederic34/core_code_syntax
...
code syntax core directory
2021-02-26 10:29:23 +01:00
daraelmin
e079ceb9c3
Fix #16420 undefined $model_mail_selected_id
...
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:51:01 +01:00
daraelmin
5d31a93bf0
Fix #16420 - undefined $model_mail_selected_id
...
Set $model_mail_selected_id to 0 when it is undefined
2021-02-26 08:20:51 +01:00
Christophe Battarel
445974a003
add event management to batch products
2021-02-25 15:47:14 +01:00
Alexandre SPANGARO
85d63e05d1
Move to INNER JOIN
2021-02-25 05:07:26 +01:00
Alexandre SPANGARO
e177ac566c
Merge remote-tracking branch 'upstream/develop' into 14a15
2021-02-25 05:02:03 +01:00
stickler-ci
a31d5e8dc9
Fixing style errors.
2021-02-24 22:32:48 +00:00
dvdwalker
4c321341d4
Fix: Ajax on/off not saving value in DB after updating to version >=12
...
The issue seams to be that starting in version 12 the "[element]_UPDATE" trigger is called in file core/ajax/objectonoff.php but some properties that are required on $object are not set.
2021-02-24 19:28:47 -03:00
Laurent Destailleur
ebb4f03788
Prepare public page for autocreate contact-lead
2021-02-24 12:19:28 +01:00
Frédéric FRANCE
554e449e40
code syntax core directory
2021-02-23 22:03:23 +01:00
Regis Houssin
0a3d1ab92e
FIX use var "saved_url" instead global var "$url"
2021-02-23 16:56:45 +01:00
Regis Houssin
ec5d9983e0
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into
...
fix_avoid_missing_url_and_token
Conflicts:
htdocs/core/js/lib_head.js.php
2021-02-23 16:55:32 +01:00
Gauthier PC portable 024
c0160a5f3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-23 15:20:15 +01:00
Laurent Destailleur
b7e2c7d87a
FIX #16393 Do not sanitize <!DOCTYPE html>
2021-02-23 12:58:43 +01:00
Frédéric FRANCE
f50ce6f91f
add cache on project head
2021-02-23 12:19:49 +01:00
Laurent Destailleur
822bfc957c
Merge pull request #16368 from FHenry/dev_EventOrganisation_draft
...
NEW : Tab on project for Event Organization #FoundationFunding
2021-02-23 12:09:00 +01:00
Laurent Destailleur
d2e1f9fce9
FIX #16096 #16085 Any call of ajax pages must provide the token
2021-02-23 11:13:57 +01:00
Regis Houssin
77cecf58ce
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token
2021-02-23 11:10:32 +01:00
Laurent Destailleur
34dcebea78
Code comment
2021-02-23 11:03:34 +01:00
Regis Houssin
7c32e43c68
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into fix_avoid_missing_url_and_token
2021-02-23 08:19:18 +01:00
Florian HENRY
fa65956801
Merge branch 'develop' into dev_EventOrganisation_draft
2021-02-22 21:02:22 +01:00
daraelmin
29b1f10fd4
Fix #16096 #16085 missing CSRF token
2021-02-22 17:33:54 +01:00
Laurent Destailleur
9e5e31dec9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-22 16:21:33 +01:00
Laurent Destailleur
f6080d45fa
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-22 16:21:26 +01:00
Laurent Destailleur
b674ebad88
Responsive
2021-02-22 16:21:05 +01:00
Laurent Destailleur
912f9f9bdb
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/contact/card.php
htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
eee936b91c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-22 15:51:16 +01:00
Laurent Destailleur
c010cab47e
Fix translation of default value for contacts
2021-02-22 15:51:00 +01:00
Laurent Destailleur
7677edf41d
Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE
...
Add substitution for delivry date
2021-02-22 14:23:37 +01:00
Alexandre SPANGARO
d9e03e1373
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-22 14:10:38 +01:00
Frédéric FRANCE
84a5f69834
fix propal sqls
2021-02-22 13:14:13 +01:00
Frédéric FRANCE
58f301389c
fix box activity
2021-02-22 12:08:22 +01:00
Alexandre SPANGARO
7f4040e464
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-22 11:59:13 +01:00
Laurent Destailleur
122538ca51
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-22 11:51:55 +01:00
Laurent Destailleur
38465ea591
Fix website editor
2021-02-22 11:51:43 +01:00
Laurent Destailleur
0be001c70b
Merge pull request #16374 from aspangaro/14a21
...
Code enhanced - Standardize field name #14697
2021-02-22 11:40:55 +01:00
Anthony Berton
566c3ada55
Update functions.lib.php
2021-02-22 11:30:00 +01:00
Alexandre SPANGARO
22c936ba19
Merge remote-tracking branch 'upstream/develop' into 14a22
2021-02-22 11:28:36 +01:00
Laurent Destailleur
c227275c55
Merge pull request #16379 from danielprowald/develop
...
CLOSE #16378 More E-Mail Contact substitution Values for better salutation
2021-02-22 11:20:03 +01:00
Laurent Destailleur
2673e93dfc
Update card_presend.tpl.php
2021-02-22 11:19:47 +01:00
Laurent Destailleur
f99232e66e
Merge branch 'develop' into 14a21
2021-02-22 11:18:07 +01:00
Daniel
7bbf1b4841
Fix Formatting
2021-02-22 10:04:29 +01:00
Daniel
38e1264588
For more flexible salutation in some languages the folloing Variables
...
are availible
__CONTACT_LASTNAME_XXX__
__CONTACT_FIRSTNAME_XXX__
__CONTACT_SALUTATION_XXX__
2021-02-22 09:56:48 +01:00
Gauthier PC portable 024
939d406ab1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-22 09:10:24 +01:00
Alexandre SPANGARO
267b095786
Fix import/export
2021-02-22 06:09:33 +01:00
Alexandre SPANGARO
ae4fc565e1
Widget & commonobject
2021-02-22 05:38:31 +01:00
Alexandre SPANGARO
d7993253e7
Export
2021-02-22 05:33:40 +01:00
Alexandre SPANGARO
dfb6490bb4
Fix export
2021-02-22 05:24:39 +01:00
Alexandre SPANGARO
116a491ae1
Revert "Fix export"
...
This reverts commit 01e351e87e
2021-02-22 05:23:02 +01:00
Alexandre SPANGARO
01e351e87e
Fix export
2021-02-22 05:19:48 +01:00
Alexandre SPANGARO
71ce871da6
Fix element
2021-02-22 05:13:14 +01:00
Anthony Berton
3256a17280
Update functions.lib.php
2021-02-21 23:52:22 +01:00
Alexandre SPANGARO
818a826c3e
Code enhanced - Standardize field name
2021-02-21 22:10:00 +01:00
Alexandre SPANGARO
2cd181b86d
Code enhanced - Standardize field name #14697
2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
ddea3f8a92
Code enhanced - Standardize field name #14697
2021-02-21 21:47:26 +01:00
Laurent Destailleur
e3419df36e
Merge branch 'develop' into 14a20
2021-02-21 20:28:06 +01:00
Laurent Destailleur
97ce13bf84
Merge pull request #16369 from frederic34/doltrunc
...
replace ... by one char in dol_trunc
2021-02-21 20:16:07 +01:00
Laurent Destailleur
c9f67b27b2
Merge pull request #16364 from frederic34/memcacheexpire
...
memcached can set expire
2021-02-21 20:14:09 +01:00
Laurent Destailleur
4bf7c89d4e
Merge pull request #16363 from frederic34/patch-2
...
fix propal box
2021-02-21 19:19:08 +01:00
Laurent Destailleur
1e62a1a13f
Merge pull request #16359 from aspangaro/14a19
...
Code enhanced - Standardize field name #14697
2021-02-21 19:18:33 +01:00
Frédéric FRANCE
71d32a7422
fix tests
2021-02-21 15:59:19 +01:00
Frédéric FRANCE
5ceb8163de
fix tests
2021-02-21 15:40:03 +01:00
Laurent Destailleur
0a7e692fbf
Wip website module
2021-02-21 14:46:52 +01:00
Frédéric FRANCE
548820011a
fix tests
2021-02-21 13:39:59 +01:00
Frédéric FRANCE
6e3a1a1d41
fix tests
2021-02-21 13:32:54 +01:00
Frédéric FRANCE
d3a98c7680
replace ... by one char in dol_trunc
2021-02-21 13:00:31 +01:00
Florian HENRY
be34fb4541
tab event ok
2021-02-21 12:32:16 +01:00
Frédéric FRANCE
5096c5bf2d
cache socialnetworks array
2021-02-21 10:18:05 +01:00
Frédéric FRANCE
41b89ae677
add files and links
2021-02-21 09:50:58 +01:00
Florian HENRY
556ba2b369
statart card
2021-02-20 23:17:48 +01:00
Frédéric FRANCE
518826ad3d
add project
2021-02-20 22:03:11 +01:00
Frédéric FRANCE
65925e60b9
memcached can set expire
2021-02-20 20:48:59 +01:00
Frédéric FRANCE
da37497a38
memcached can set expire
2021-02-20 20:47:01 +01:00
Laurent Destailleur
91d0652476
Clean code of cache
2021-02-20 18:32:16 +01:00
Laurent Destailleur
1dd1dcefc5
Rename cache keys
2021-02-20 18:25:48 +01:00
Laurent Destailleur
341cd06252
Clean code for cache feature
2021-02-20 18:21:10 +01:00
Frédéric FRANCE
997dee67af
fix propal box
2021-02-20 17:42:51 +01:00
Laurent Destailleur
07578fc518
Merge branch 'develop' into countactioncomm
2021-02-20 17:24:22 +01:00
Laurent Destailleur
cfccc49235
Code comment
2021-02-20 17:23:03 +01:00
Frédéric FRANCE
57e15eb46d
try to apply the advice
2021-02-20 17:12:06 +01:00
Laurent Destailleur
4b632fb24f
Merge branch 'develop' into 14a19
2021-02-20 17:08:23 +01:00
Laurent Destailleur
c56c97b1b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-20 17:03:44 +01:00
Laurent Destailleur
ade5d98d56
Rename script to run cron by url to avoid confusion with script from cli
2021-02-20 17:03:27 +01:00
Laurent Destailleur
7c25f06f58
Merge pull request #16353 from aspangaro/14a18
...
Code enhanced - Standardize field name #14697
2021-02-20 16:51:34 +01:00
Frédéric FRANCE
ec1dd40a8a
enhance caching
2021-02-20 15:52:45 +01:00
Frédéric FRANCE
99fa13cbad
enhance caching
2021-02-20 15:41:57 +01:00
Alexandre SPANGARO
3dcfe40e71
Code enhanced - Standardize field name #14697
2021-02-20 08:00:27 +01:00
Alexandre SPANGARO
1017d480f9
Code enhanced - Standardize field name #14697
2021-02-20 07:08:37 +01:00
Frédéric FRANCE
a63daaa8e1
Merge remote-tracking branch 'upstream/develop' into countactioncomm
2021-02-19 23:31:09 +01:00
Frédéric FRANCE
3238dbec92
Merge remote-tracking branch 'upstream/develop' into countactioncomm
2021-02-19 23:24:53 +01:00
Frédéric FRANCE
1e3ae8348a
use cache
2021-02-19 23:16:56 +01:00
Laurent Destailleur
581d137aa8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 22:06:56 +01:00
Laurent Destailleur
712c2f20df
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
b167a4a0c7
FIX date selector when using reduced year (like on smartphone)
2021-02-19 22:00:44 +01:00
Alexandre SPANGARO
708a9fb453
Code enhanced - Standardize field name
2021-02-19 21:57:54 +01:00
Laurent Destailleur
eeedbccc71
Merge pull request #16351 from aspangaro/14a16
...
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-19 18:20:17 +01:00
Laurent Destailleur
069cf46f16
Merge pull request #16347 from andreubisquerra/master
...
NEW Can use captcha on public page to create ticket
2021-02-19 18:07:25 +01:00
Laurent Destailleur
26134930b3
Update html.formticket.class.php
2021-02-19 18:05:12 +01:00
daraelmin
52dce616b9
FIX 16165 Create customer discount without vat
2021-02-19 18:03:36 +01:00
Laurent Destailleur
5f0fd91463
Merge pull request #16340 from daraelmin/daraelmin-patch-1
...
FIX #16165 Create customer discount without vat
2021-02-19 18:03:09 +01:00
Laurent Destailleur
3a073c75e7
Too verbose
2021-02-19 18:01:47 +01:00
Florian HENRY
e46d4ee75d
fix sample product import files
2021-02-19 18:01:36 +01:00
Florian HENRY
f111302a25
fix column count
2021-02-19 18:01:25 +01:00
Florian HENRY
32a360dd2a
fix sample xls file
2021-02-19 18:01:16 +01:00
Florian HENRY
527c32d79e
with new phpoffice col start at 1 not 0
2021-02-19 18:01:04 +01:00
Laurent Destailleur
db34481cf6
Merge pull request #16345 from FHenry/13_fix_column_excelfiles
...
FIX : Import Excel Failed and sample import file excel missing 1st column
2021-02-19 17:56:58 +01:00
Laurent Destailleur
fd0615b3fc
Too verbose
2021-02-19 17:56:04 +01:00
Laurent Destailleur
3ab80469ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 16:11:36 +01:00
Laurent Destailleur
574c0df427
Merge pull request #16338 from aspangaro/13p5
...
Fix module asset in development
2021-02-19 16:05:35 +01:00
Laurent Destailleur
8e799162ec
Merge pull request #16333 from FHenry/dev_new_field_product_export
...
NEW Add price min and price min tcc into product export
2021-02-19 15:59:58 +01:00
Laurent Destailleur
e9f9c46cd6
Clean code. Fix nojs=1
2021-02-19 15:37:42 +01:00
Laurent Destailleur
efb32c7d0b
Fix test pages
2021-02-19 15:06:36 +01:00
Laurent Destailleur
b6211a7990
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 14:12:00 +01:00
Laurent Destailleur
39237ca86e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-19 14:06:07 +01:00
Laurent Destailleur
8265f7a07e
Code comment
2021-02-19 14:05:46 +01:00
Laurent Destailleur
95b859dfd5
Merge pull request #16247 from bafbes/abb120355
...
New : Hook selectForFormsListWhere
2021-02-19 12:49:42 +01:00
Laurent Destailleur
ceccf85919
Merge pull request #16342 from frederic34/patch-3
...
fix unknown variable
2021-02-19 12:40:54 +01:00
Laurent Destailleur
5340c30db3
FIX missing security test on payment page
...
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
Anthony Berton
a858666b15
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into ADD_SUBSTITUTION_DELIVRY_DATE
2021-02-19 09:13:37 +01:00
Laurent Destailleur
485dd07f67
NEW Can show the holidays on the agenda view.
2021-02-18 23:13:55 +01:00
Alexandre SPANGARO
f462455e89
NEW: Add option CONTRACT_ALLOW_EXTERNAL_DOWNLOAD
2021-02-18 21:39:25 +01:00
andreubisquerra
b8fabd90f8
NEW Use captcha on public page to create ticket
2021-02-18 19:02:16 +01:00
Frédéric FRANCE
354872b47c
Merge remote-tracking branch 'upstream/develop' into countactioncomm
2021-02-18 18:40:16 +01:00
Anthony Berton
bacafd326e
Update functions.lib.php
2021-02-18 16:13:40 +01:00
Laurent Destailleur
b607ed6259
Look and feel v14
2021-02-18 15:58:38 +01:00
Laurent Destailleur
2904cc803f
Fix selection in combo
2021-02-18 13:56:13 +01:00
Florian HENRY
6fe9b589ed
fix sample product import files
2021-02-18 12:50:15 +01:00
Florian HENRY
58a1904c15
fix column count
2021-02-18 12:48:06 +01:00
Laurent Destailleur
56d2ac274a
NEW Support color of type of event
2021-02-18 12:46:42 +01:00
Florian HENRY
de2d5c7188
fix sample xls file
2021-02-18 12:24:24 +01:00
Florian HENRY
35dc1e7d4f
with new phpoffice col start at 1 not 0
2021-02-18 11:04:37 +01:00
Frédéric FRANCE
cc6a7d4834
fix unknown variable
2021-02-18 09:05:44 +01:00
daraelmin
f5b162a992
FIX 16165 Create customer discount without vat
2021-02-18 08:10:14 +01:00
Frédéric FRANCE
45e947ee2b
count actioncomm for thirdparty tab agenda
2021-02-17 22:16:07 +01:00
Frédéric FRANCE
933a944603
count actioncomm for thirdparty tab agenda
2021-02-17 22:14:21 +01:00
stickler-ci
8673f7625f
Fixing style errors.
2021-02-17 17:36:29 +00:00
Florian HENRY
fc3cc915ee
new_add_field_product_export
2021-02-17 18:29:56 +01:00
Laurent Destailleur
36e0deba3f
Look and feel v14
2021-02-17 17:56:08 +01:00
Gauthier PC portable 024
134d7e00ec
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-17 16:56:50 +01:00
Laurent Destailleur
9161c34f51
Fix logs
2021-02-17 15:21:52 +01:00
Laurent Destailleur
68637c3104
Better log for hook
2021-02-17 15:17:24 +01:00
Laurent Destailleur
bfe71e8509
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-17 14:28:19 +01:00
Laurent Destailleur
c8824ccea0
Look and feel v14
2021-02-16 17:05:38 +01:00
Laurent Destailleur
a81e4d4daa
Fix bad picto
2021-02-16 13:21:18 +01:00
Laurent Destailleur
6f25f7c2cb
Clean code
2021-02-16 11:43:26 +01:00
Laurent Destailleur
d16276ea2c
Clean code
2021-02-16 11:15:42 +01:00
Alexandre SPANGARO
8079105aaf
NEW: VAT report - Optimisation & collapse by rate
2021-02-16 04:28:55 +01:00
Laurent Destailleur
54640199af
Fix deletion if permission on dir is not write.
2021-02-15 23:43:56 +01:00
Laurent Destailleur
5b42bce149
Add more complete info on change of opportunity status.
2021-02-15 22:43:27 +01:00
Laurent Destailleur
dabf9d796a
FIX Rename title of template invoice
2021-02-15 22:16:01 +01:00
Laurent Destailleur
44b3221aaf
FIX Rename title of template invoice
2021-02-15 22:15:14 +01:00
Laurent Destailleur
4ffdfe110a
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-15 22:07:11 +01:00
Laurent Destailleur
00642ffb48
Fix label of invoice
2021-02-15 22:04:35 +01:00
Laurent Destailleur
7bbb603859
Fix default template for contract can be empty
2021-02-15 21:46:07 +01:00
Laurent Destailleur
32370bf63d
Look and feel v14
2021-02-15 20:13:38 +01:00
Laurent Destailleur
be3703a05b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
2021-02-15 16:46:55 +01:00
Laurent Destailleur
0bac454f25
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-15 16:40:45 +01:00
Laurent Destailleur
7b383b58c6
Trans
2021-02-15 16:35:51 +01:00
Laurent Destailleur
d183a7eedf
Merge pull request #16288 from FHenry/dev_EventOrganisation_setuppage
...
wip : Event Organization module - PR-1 - setup page #FoundationFunding
2021-02-15 15:59:19 +01:00
Laurent Destailleur
3ec515e106
Fix default value
2021-02-15 15:53:46 +01:00
Laurent Destailleur
9c1d76aaaa
Merge pull request #16294 from frederic34/patch-3
...
define variable for all execution paths
2021-02-15 15:53:12 +01:00
Laurent Destailleur
b98a654321
NEW The setup for mandatory field can be done on combo list too.
2021-02-15 15:37:43 +01:00
Laurent Destailleur
fd5fe5b427
Look and feel
2021-02-15 14:38:28 +01:00
Laurent Destailleur
7e7d393f30
Look and feel v14
2021-02-15 14:19:05 +01:00
Laurent Destailleur
026259ebd7
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/product/fournisseurs.php
2021-02-15 13:12:27 +01:00
Laurent Destailleur
1b69456216
Complete response
2021-02-15 13:00:21 +01:00
Laurent Destailleur
49f8ff5708
FIX #16286
2021-02-15 12:18:09 +01:00
Florian HENRY
1427f66e10
Merge branch 'dev_EventOrganisation' into dev_EventOrganisation_setuppage
2021-02-15 11:20:07 +01:00
Florian HENRY
e1f503a8cf
Merge branch 'develop' into dev_EventOrganisation
2021-02-15 11:19:08 +01:00
Frédéric FRANCE
382123b64a
define variable for all execution paths
...
The variable $filelog does not seem to be defined for all execution paths leading up to this point.
2021-02-15 08:36:40 +01:00
Laurent Destailleur
25230fb4bb
Merge pull request #16284 from andreubisquerra/develop
...
Improve logo printing compatibility with TakePOS connector
2021-02-14 21:41:45 +01:00
Laurent Destailleur
e802dd87f4
Merge branch 'develop' into dev_EventOrganisation_setuppage
2021-02-14 21:37:45 +01:00
Laurent Destailleur
4d526569a7
Merge pull request #16292 from frederic34/patch-5
...
Use dictionary to display social network icon
2021-02-14 21:34:13 +01:00
Laurent Destailleur
2cc4632a39
Fix js error
2021-02-14 21:32:19 +01:00
Frédéric FRANCE
917f15a781
Use dictionary to display social network icon
2021-02-14 21:30:54 +01:00
Laurent Destailleur
9e16cd5b77
Look and feel v14
2021-02-14 20:47:57 +01:00
Laurent Destailleur
66c7770146
Factorize some common code for type of event
2021-02-14 20:12:43 +01:00
abb
e6d35039c9
fix:Handle constant MAIN_SHOW_SOCIETE2EXTERN in checkUserAccessToObject
2021-02-14 18:02:30 +01:00
Florian HENRY
5958373f47
set icon fa
2021-02-14 17:31:30 +01:00
Florian HENRY
02b698c128
move files to real diredtory
2021-02-14 17:09:23 +01:00
Florian HENRY
21a8d4d470
ok for setup pages
2021-02-14 17:06:49 +01:00
Florian HENRY
b5055a5edb
config pages ok
2021-02-14 16:41:57 +01:00
Florian HENRY
07984d9a6e
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-02-14 15:02:29 +01:00
Florian HENRY
d7dfb9138a
working on setup
2021-02-14 15:00:20 +01:00
andreubisquerra
abda9eeb93
Improve compatibility with logo printing with TakePOS connector
2021-02-14 00:02:03 +01:00
abb
d82c62c40d
New:Constant MAIN_SHOW_SOCIETE2EXTERN to allow access to any thirdparty for external users
2021-02-12 23:53:45 +01:00
Laurent Destailleur
cd4d790d2b
Add parameters of batch into comment description
2021-02-12 17:15:23 +01:00
Florian HENRY
f063606f27
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
2021-02-12 11:32:07 +01:00
Florian HENRY
9858aec6d6
on going
2021-02-12 11:31:13 +01:00
Laurent Destailleur
e37a4be1d6
Update html.form.class.php
2021-02-11 20:10:15 +01:00
Laurent Destailleur
4a2cd0d509
Merge pull request #16253 from AlexisLaurier/13.0
...
contract - uses of multidir_output for file path
2021-02-11 19:00:20 +01:00
Laurent Destailleur
1b11d9d0e9
FIX payment term label on PDF
2021-02-11 17:48:53 +01:00
Anthony Berton
d10e46adca
Update commonobject.class.php
2021-02-11 17:46:28 +01:00
Florian HENRY
256e2e1b6e
nouveau fichier : ../core/modules/modEventOrganization.class.php
...
nouveau fichier : ../eventorganization/.editorconfig
nouveau fichier : ../eventorganization/.gitattributes
nouveau fichier : ../eventorganization/.gitignore
nouveau fichier : ../eventorganization/.tx/config
nouveau fichier : ../eventorganization/COPYING
nouveau fichier : ../eventorganization/ChangeLog.md
nouveau fichier : ../eventorganization/README.md
nouveau fichier : ../eventorganization/eventorganizationindex.php
nouveau fichier : ../eventorganization/lib/eventorganization.lib.php
nouveau fichier : ../eventorganization/modulebuilder.txt
nouveau fichier : ../eventorganization/myobject_contact.php
nouveau fichier : ../../test/phpunit/EventOrganizationFunctionalTest.php
2021-02-11 17:17:02 +01:00
Florian HENRY
13522fdf5f
start module dev
2021-02-11 17:05:04 +01:00
Anthony Berton
55f8d64202
Update commonobject.class.php
2021-02-11 12:16:07 +01:00
Laurent Destailleur
ee6bc80242
Fix phpcs
2021-02-11 01:59:13 +01:00
Laurent Destailleur
a01301c500
Fix regression in color of bar for type = line
2021-02-10 18:44:09 +01:00
Laurent Destailleur
623d7b9819
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-10 18:04:23 +01:00
Laurent Destailleur
88550ab417
Look and feel v14
2021-02-10 18:03:45 +01:00
Laurent Destailleur
8b125d8076
Fix MVC. Actions must be before output.
2021-02-10 16:44:20 +01:00
Laurent Destailleur
72bfa81082
Update html.form.class.php
2021-02-10 14:14:28 +01:00
Laurent Destailleur
0849ce288c
Fix phpcs
2021-02-10 14:04:06 +01:00
Alexis LAURIER
5b2779a5f9
contract - use multidir_output
2021-02-10 13:27:42 +01:00
Alexis LAURIER
05b1171e90
Merge branch '13.0' of https://github.com/AlexisLaurier/dolibarr into 13.0
2021-02-10 13:19:47 +01:00
Alexis LAURIER
468f40743d
contract - use multidir_output
2021-02-10 13:18:55 +01:00
LAURIER Alexis
cb4295b702
dol_check_secure_access_document contrat multidir_
...
Use multidir_output for contracts document check to manage entity on each contract
2021-02-10 13:02:13 +01:00
Laurent Destailleur
4f2e7c51fc
Fix #16129 autodetect language on public pages
2021-02-10 03:20:50 +01:00
Laurent Destailleur
89154265c6
FIX #16129
2021-02-10 03:12:19 +01:00
Laurent Destailleur
4c3a96da08
FIX #16150
2021-02-10 02:57:08 +01:00
Laurent Destailleur
667963094f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-02-10 02:17:14 +01:00
Laurent Destailleur
c875ad9a1c
FIX #16240
2021-02-10 02:17:01 +01:00
Laurent Destailleur
499ebd73b1
Merge pull request #16192 from FHenry/dev_add_hook_ecm_auto
...
NEW : add hook addSectionECMAuto method to add cuistom diretory into ECM auto files
2021-02-10 01:32:29 +01:00
Laurent Destailleur
c2df267858
Merge pull request #16242 from frederic34/patch-4
...
remove deprecated
2021-02-10 01:29:47 +01:00
Laurent Destailleur
e84834d219
Merge pull request #16236 from grandoc/new_branch_09_02_2021
...
standardisation, internationalisation
2021-02-10 01:28:16 +01:00
Laurent Destailleur
2c30680157
Merge pull request #16244 from AlexisLaurier/13.0
...
fix regression of #16118 - entity not check on object in checkUserAccessToObject
2021-02-10 01:25:19 +01:00
Laurent Destailleur
afeeb40e2e
Fix show property "enabled" of extrafields
2021-02-10 00:18:00 +01:00
abb
17f77b8edb
New : Hook selectForFormsListWhere
2021-02-09 23:49:46 +01:00
LAURIER Alexis
0ae0eb5758
fix regression of #16118 - entity not check
...
Entity is not anymore check for user having permission $user->rights->societe->client->voir on the current entity. Then we can open object from any entity with current permissions and the entity field of objects are not anymore checked.
2021-02-09 20:13:13 +01:00
Laurent Destailleur
0a2ace81ff
Fix phpcs
2021-02-09 18:15:32 +01:00
Frédéric FRANCE
da8c80071f
Update html.form.class.php
2021-02-09 18:09:35 +01:00
Laurent Destailleur
21558dd0a6
Debug and enhance the feature to assign tasks on project assignation
2021-02-09 17:52:33 +01:00
Frédéric FRANCE
71a2c20d4b
massaction validate invoice do not regenerate pdf
2021-02-09 14:32:04 +01:00
Philippe GRAND
66b06405d9
standardization, internationalisation
2021-02-09 14:20:10 +01:00
Philippe GRAND
44f2269764
standardization, internationalisation
2021-02-09 14:19:17 +01:00
Philippe GRAND
8fd7d3e586
standardization, internationalisation
2021-02-09 14:18:27 +01:00
Philippe GRAND
182563329f
standardization, internationalisation
2021-02-09 14:17:38 +01:00
Philippe GRAND
635260e59f
standardization, internationalisation
2021-02-09 14:16:47 +01:00
Philippe GRAND
663108d239
standardization, internationalisation
2021-02-09 14:16:17 +01:00
Philippe GRAND
8d9ae906c8
standardization, internationalisation
2021-02-09 14:15:45 +01:00
Philippe GRAND
e1bf624e45
standardization, internationalisation
2021-02-09 14:15:14 +01:00
Philippe GRAND
a2b5a3190d
standardization, internationalisation
2021-02-09 14:14:40 +01:00
Philippe GRAND
c1bbd076df
standardization, internationalisation
2021-02-09 14:13:49 +01:00
Philippe GRAND
1317b5cfac
standardization, internationalisation
2021-02-09 14:13:12 +01:00
Philippe GRAND
3e9a6818f2
standardization, internationalisation
2021-02-09 14:12:27 +01:00
Philippe GRAND
f47d5e6a69
standardization, internationalisation
2021-02-09 14:10:07 +01:00
Philippe GRAND
ef3e7fa65a
standardization, internationalisation
2021-02-09 14:09:35 +01:00
Philippe GRAND
2fc6d76029
standardization, internationalisation
2021-02-09 14:09:02 +01:00
Philippe GRAND
ee50cee862
standardization, internationalisation
2021-02-09 14:07:58 +01:00
Philippe GRAND
a50ecdd1aa
standardization, internationalisation
2021-02-09 14:06:55 +01:00
Philippe GRAND
fff2c1fbac
standardization, internationalisation
2021-02-09 14:06:22 +01:00
Philippe GRAND
4840fa8214
standardization, internationalisation
2021-02-09 14:05:19 +01:00
Philippe GRAND
858ebf5aaf
standardization, internationalisation
2021-02-09 14:04:38 +01:00
Philippe GRAND
a8b72c98a2
standardization, internationalisation
2021-02-09 14:03:13 +01:00
Philippe GRAND
ff0c105207
standardization, internationalisation
2021-02-09 14:01:50 +01:00
Philippe GRAND
55dd15cbf6
standardization, internationalisation
2021-02-09 14:01:10 +01:00
Philippe GRAND
11053fe0ed
standardization, internationalisation
2021-02-09 14:00:26 +01:00
Philippe GRAND
39c3bcd265
standardization, internationalisation
2021-02-09 13:58:26 +01:00
Laurent Destailleur
3d892bd60b
Merge pull request #15735 from FHenry/dev_new_project_task_add_contact
...
NEW: When add contact/user to Project, ask to also affect on Tasks
2021-02-09 13:43:08 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
...
use camelCaps name
2021-02-09 13:29:40 +01:00
Laurent Destailleur
5e9065390a
Merge pull request #16228 from FHenry/dev_new_autoload_product_extrafield_line_createtpl
...
NEW:add hidden option to auto load input line extrafield into new lines
2021-02-09 13:24:53 +01:00
Laurent Destailleur
3b0268424b
Merge pull request #16227 from grandoc/new_branch_08_02_2021
...
Save the name of generated file as the main doc when generating a doc…
2021-02-09 13:24:02 +01:00
Laurent Destailleur
a5386246cd
Merge pull request #16225 from frederic34/facturerec
...
clean deprecated modelpdf to model_pdf
2021-02-09 13:23:25 +01:00
Frédéric FRANCE
04c25a01af
deprecate non camelCaps functions
2021-02-09 13:10:11 +01:00
Gauthier PC portable 024
d106fe7e90
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-09 09:50:46 +01:00
Frédéric FRANCE
266b217675
add var def in commondocgenerator
2021-02-09 08:35:22 +01:00
Laurent Destailleur
401b4f641d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
2021-02-08 22:13:50 +01:00
Frédéric FRANCE
898bf55202
Merge remote-tracking branch 'upstream/develop' into facturerec
2021-02-08 20:21:46 +01:00
Florian HENRY
b3872ca28a
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto
2021-02-08 20:06:08 +01:00
Laurent Destailleur
5966e63120
Fix css
2021-02-08 20:01:10 +01:00
Florian HENRY
1e6144a99d
fix indent
2021-02-08 19:59:18 +01:00
Laurent Destailleur
af4d3767ea
css
2021-02-08 19:56:38 +01:00
Florian HENRY
b6b736c402
NEW:add hidden option to auto load input line extrafield into new lines
2021-02-08 19:56:34 +01:00
Philippe GRAND
f27dd77cb6
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:47:31 +01:00
Philippe GRAND
62d6666927
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:46:09 +01:00
Philippe GRAND
d9eb727c0f
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:44:46 +01:00
Philippe GRAND
f80da203e0
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:43:36 +01:00
Philippe GRAND
6b0bb90ab2
Save the name of generated file as the main doc when generating a doc with this template
2021-02-08 19:40:27 +01:00
Frédéric FRANCE
815f3602e3
clean deprecated modelpdf to model_pdf
2021-02-08 18:30:09 +01:00
Laurent Destailleur
925d81d1b3
Merge pull request #16002 from Hystepik/develop#1
...
New update of funnel of prospection
2021-02-08 18:05:48 +01:00
Laurent Destailleur
6892ad9630
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
2021-02-08 17:25:05 +01:00
Laurent Destailleur
c0aa7e7db5
Merge pull request #16020 from atm-gauthier/NEW/add_real_payments_on_vat_objects
...
NEW VAT payment request and VAT payment are 2 different steps in workflow on VAT payment recording
2021-02-08 17:19:40 +01:00
Laurent Destailleur
25823d7b90
Merge pull request #16158 from atm-lena/FIX_12.0_SUPPLIER_OBJECTLINE_CONF_DISPLAY
...
Add hidden conf to display supplier in object lines
2021-02-08 16:58:28 +01:00
Laurent Destailleur
c33fb4badc
Merge pull request #16219 from FHenry/dev_fix_continue
...
Add extrafileld value into return ajax
2021-02-08 16:57:03 +01:00
Florian HENRY
cb152b22df
fix ajax
2021-02-08 15:47:37 +01:00
Laurent Destailleur
8041ef641a
Merge branch 'develop' into dev_typent_jax_workcorrectly
2021-02-08 15:29:36 +01:00
Laurent Destailleur
2440c11eec
Merge pull request #16214 from FHenry/dev_fix_continue
...
Various fix in dev branch
2021-02-08 15:11:32 +01:00
Laurent Destailleur
fe9d23e90b
Update functions.lib.php
2021-02-08 15:10:14 +01:00
Frédéric FRANCE
e15e8bcd05
Update functions.lib.php
2021-02-08 15:10:07 +01:00
Laurent Destailleur
7526bef3f8
Merge pull request #16211 from frederic34/patch-2
...
Update functions.lib.php
2021-02-08 15:08:46 +01:00
Laurent Destailleur
d0bbf5bf35
Update functions.lib.php
2021-02-08 15:08:24 +01:00
Laurent Destailleur
5c64173bfa
Merge pull request #16209 from frederic34/barcodepicto
...
add barcode picto in left menu
2021-02-08 15:04:56 +01:00
Laurent Destailleur
026e454825
Merge pull request #16208 from frederic34/ecmpicto
...
add ecm picto in left menu
2021-02-08 15:04:42 +01:00
Florian HENRY
1e8117dc8a
fix js
2021-02-08 11:49:30 +01:00
Florian HENRY
31ca17c619
fix require once
2021-02-08 11:06:21 +01:00
Gauthier PC portable 024
41af1a59f4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries
2021-02-08 10:37:01 +01:00
Gauthier PC portable 024
e2a73e6c88
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-08 09:46:48 +01:00
Alexandre SPANGARO
b8ea96ba57
Fix module asset in development
2021-02-08 05:39:07 +01:00
Frédéric FRANCE
c83ccb1e0f
Update functions.lib.php
2021-02-08 00:46:46 +01:00
Frédéric FRANCE
e1a22b7209
add blockedlog picto in left menu
2021-02-07 22:18:34 +01:00
Frédéric FRANCE
3c8ddf917f
add barcode picto in left menu
2021-02-07 22:15:20 +01:00
Frédéric FRANCE
b43dfe1139
add ecm picto in left menu
2021-02-07 22:04:46 +01:00
Laurent Destailleur
fc30b91960
Fix warning
2021-02-07 21:56:57 +01:00
Laurent Destailleur
8f4bd10a8d
Merge pull request #16190 from FHenry/13_fix_checkdeposit_pdf_folder
...
FIX : #16189 , fix download/see check deposit PDF
2021-02-07 21:34:18 +01:00
Laurent Destailleur
1f32d4a815
Avoid warning
2021-02-07 21:21:21 +01:00
Laurent Destailleur
899ae37f42
Merge pull request #16197 from CaringDev/noAutocompleteCaptcha
...
prevent browsers from storing / suggesting old captchas
2021-02-07 20:04:32 +01:00
Laurent Destailleur
92e67b2c54
Merge pull request #16195 from frederic34/morepictomodule
...
add more picto for module
2021-02-07 20:01:36 +01:00
Laurent Destailleur
92d40d065a
Merge pull request #16207 from frederic34/patch-4
...
fix html
2021-02-07 20:01:03 +01:00
Laurent Destailleur
ec394a93f6
Merge pull request #16191 from grandoc/develop
...
fix typo
2021-02-07 19:59:54 +01:00
Laurent Destailleur
14241148f4
Merge pull request #16193 from frederic34/phpmin
...
update phpmin version
2021-02-07 19:59:35 +01:00
Laurent Destailleur
c24a8a22d5
Merge pull request #16203 from frederic34/patch-3
...
fix phpcs
2021-02-07 19:56:07 +01:00
Laurent Destailleur
45789ec21c
Fix TZ problems
...
Conflicts:
htdocs/core/lib/company.lib.php
2021-02-07 19:47:33 +01:00
Frédéric FRANCE
dbe5c23ed5
Update box_produits_alerte_stock.php
2021-02-07 19:45:18 +01:00
Laurent Destailleur
8c71c8335e
Fix TZ problems
2021-02-07 19:44:22 +01:00
Frédéric FRANCE
58a39a263b
Update box_produits.php
2021-02-07 19:44:09 +01:00
Frédéric FRANCE
ebe7e1464a
fix html
2021-02-07 19:38:46 +01:00
Frédéric FRANCE
b3dc87f3b7
fix phpcs
2021-02-07 18:31:31 +01:00
Laurent Destailleur
d4df62f1da
Look and feel v14
2021-02-07 17:25:41 +01:00
Frédéric FRANCE
0bfe55c3d2
add picto mail
2021-02-06 17:26:16 +01:00
Frédéric FRANCE
b96e405717
add picto member
2021-02-06 17:18:00 +01:00
Raphael Schweizer
0be168561f
prevent browsers from storing / suggesting old captchas
2021-02-06 16:10:05 +01:00
Frédéric FRANCE
3bcf795d55
add more picto for module
2021-02-06 14:44:08 +01:00
Frédéric FRANCE
eaaefe1382
5.5 to 5.6
2021-02-06 14:12:22 +01:00
Frédéric FRANCE
7860ffa28e
update phpmin version
2021-02-06 13:48:31 +01:00
Florian HENRY
377427da1d
add hook to custom directory into automatic file ECM
2021-02-06 13:25:35 +01:00
Florian HENRY
3b4f8c32f7
add hook to custom directory into automatic file ECM
2021-02-06 13:21:16 +01:00
Philippe GRAND
ce7a3ae2f0
fix typo
2021-02-06 13:11:58 +01:00
Philippe GRAND
04373fb531
fix typo
2021-02-06 13:11:08 +01:00
Philippe GRAND
bf211c6423
fix typo
2021-02-06 13:10:00 +01:00
Florian HENRY
901b3287a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_hook_ecm_auto
2021-02-06 12:41:59 +01:00
Florian HENRY
fcb5b3900d
FIX : #16189 , fix download/see check deposit PDF
2021-02-06 12:39:40 +01:00
Laurent Destailleur
7b72ac5a7a
Look and feel v14
2021-02-06 12:10:27 +01:00
Laurent Destailleur
3dedd81f37
Same width for all picto of menu
2021-02-06 11:56:27 +01:00
Laurent Destailleur
c1eba5a885
Merge pull request #16188 from frederic34/menuprefix
...
modules can add prefix for menu
2021-02-06 11:41:46 +01:00
Frédéric FRANCE
b487644cb7
sample use for margin module
2021-02-06 10:52:03 +01:00
Frédéric FRANCE
df67de08b1
modules can add prefix for menu
2021-02-06 10:16:07 +01:00
Laurent Destailleur
a2a2127953
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-06 01:17:16 +01:00
Laurent Destailleur
fd3354142b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
2021-02-06 01:17:05 +01:00
Laurent Destailleur
b2aab07842
Merge pull request #16180 from grandoc/new_branch_05_02_2021
...
update minimum version
2021-02-06 00:19:17 +01:00
Laurent Destailleur
f0e1c02caa
Look and feel v14 - Use placeholder on combolists
2021-02-06 00:05:24 +01:00
Philippe GRAND
b2e61aa499
fix typo
2021-02-05 18:23:17 +01:00
Philippe GRAND
47ca631193
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
2021-02-05 18:09:36 +01:00
Philippe GRAND
5b5ea075e7
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
2021-02-05 18:07:02 +01:00
Philippe GRAND
5856f9e5cb
Save the name of generated file as the main doc when generating a doc with this template and missing declarations
2021-02-05 18:04:46 +01:00
Philippe GRAND
4170332aee
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:58:54 +01:00
Philippe GRAND
0f196d7f19
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:56:57 +01:00
Philippe GRAND
e638c238c6
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:54:51 +01:00
Philippe GRAND
7c13428456
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:53:34 +01:00
Philippe GRAND
c03da95acb
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:52:12 +01:00
Philippe GRAND
d85c8c44fc
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:49:43 +01:00
Philippe GRAND
998c5b2ec3
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:42:33 +01:00
Philippe GRAND
c96d36cad3
Save the name of generated file as the main doc when generating a doc with this template
2021-02-05 17:39:22 +01:00
Laurent Destailleur
482ad20a4d
Log debug before archive logs
2021-02-05 16:14:42 +01:00
Laurent Destailleur
653fa38b06
Fix autoselect of category with 'auto'
2021-02-05 15:12:12 +01:00
Laurent Destailleur
7278a8c17f
Fix autoselect of category with 'auto'
2021-02-05 15:07:07 +01:00
Laurent Destailleur
2851bac0af
Fix param urlencode
2021-02-05 14:46:20 +01:00
Laurent Destailleur
ac83cea83a
Fix avoid to run import twice by clicking on tab step6
...
Fix timeout for real import step
2021-02-05 14:34:04 +01:00
Florian HENRY
df7f18d4d2
add hook to add directory into ECM auto files
2021-02-05 13:33:48 +01:00
Laurent Destailleur
c441b54521
NEW If not logo defined, can use squarred logo on login page
2021-02-05 12:07:39 +01:00
Gauthier PC portable 024
df8ca1ef84
Merge branch '12.0_new_payments_on_salaries' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_salaries
2021-02-05 09:29:20 +01:00
Laurent Destailleur
21a9a69ba1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
test/phpunit/SecurityTest.php
2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e
Fix GETPOST accept < if followed with a number
2021-02-04 23:36:41 +01:00
Laurent Destailleur
42557a0148
Memory optimization in blockedlog module
2021-02-04 23:03:09 +01:00
Laurent Destailleur
a4f6c2d0c6
More log
2021-02-04 22:03:58 +01:00
Laurent Destailleur
2a48529aea
Look and feel v14
2021-02-04 20:44:38 +01:00
Laurent Destailleur
964fa7a72d
Look and feel v14
2021-02-04 20:29:57 +01:00
Laurent Destailleur
1b7ee97082
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-04 19:49:32 +01:00
Laurent Destailleur
87a12b39b0
Fix css
2021-02-04 19:28:49 +01:00
Laurent Destailleur
726ef265f2
Look and feel v14
2021-02-04 19:21:07 +01:00
Gauthier PC portable 024
e188ec6cd7
NEW : add real payments on salaries objects
2021-02-04 17:21:08 +01:00
Laurent Destailleur
a6b08b241f
Doc
2021-02-04 17:13:00 +01:00
Laurent Destailleur
eee49b9132
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/delais.php
2021-02-04 13:50:07 +01:00
Laurent Destailleur
524b28d8c3
Fix missing tab info on holiday
2021-02-04 12:15:31 +01:00
Laurent Destailleur
eca010937f
FIX Trigger on expense report was not fired
...
FIX Bad dates on info tabs
2021-02-04 11:56:53 +01:00
atm-lena
c5f73ec12a
Resolve ret
2021-02-04 10:42:42 +01:00
Florian HENRY
2d77787bba
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_typent_jax_workcorrectly
2021-02-04 09:06:36 +01:00
Florian HENRY
86e9398b79
no inner join
2021-02-04 09:05:58 +01:00
Laurent Destailleur
31e1e3e4df
Fix cookie for remind the collapse status
2021-02-03 22:37:20 +01:00
Laurent Destailleur
f301635681
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
787e03a10d
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-02-03 20:46:22 +01:00
Laurent Destailleur
4bba124c3f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-02-03 20:43:32 +01:00
Laurent Destailleur
348fd0fcb5
FIX #16160
2021-02-03 19:36:10 +01:00
atm-lena
e9b5a52a4f
Add hidden conf to display supplier in object lines
2021-02-03 15:22:04 +01:00
Laurent Destailleur
2e7de1d137
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
test/phpunit/ExportTest.php
2021-02-02 16:17:53 +01:00
Laurent Destailleur
c5201b95bb
FIX Must not be able to edit vat of all lines if not draft
2021-02-02 16:12:03 +01:00
Laurent Destailleur
217989d0e2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-02-02 15:37:40 +01:00
Laurent Destailleur
bd9eb4c949
FIX Assignement of actors on tasks
2021-02-02 15:36:54 +01:00
Laurent Destailleur
fed99aa3bb
FIX Assignement of actors on tasks
2021-02-02 15:35:40 +01:00
Laurent Destailleur
6b32fd33fd
Fix export with excell
2021-02-02 13:33:44 +01:00
Laurent Destailleur
4d029194d3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/ajax.lib.php
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
2021-02-02 13:22:23 +01:00
Laurent Destailleur
85357a34c8
Fix style of injected combo to select variant
2021-02-02 13:12:12 +01:00
Laurent Destailleur
b80de4aeaf
FIX CSRF errors on margin forms
2021-02-02 13:04:41 +01:00
Laurent Destailleur
1fd2f12673
Fix responsive
2021-02-02 11:16:25 +01:00
Laurent Destailleur
3b9bd3cc40
Fix responsive
2021-02-02 11:15:16 +01:00
Laurent Destailleur
218a76ee63
FIX SQL Error with postgres or mysql strict mode
2021-02-02 11:06:58 +01:00
lvessiller
3b050c3452
FIX select default mail template
2021-02-02 10:34:33 +01:00
Laurent Destailleur
2e9656a5b2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/filefunc.inc.php
2021-02-02 03:26:20 +01:00
Laurent Destailleur
f5df3b1d69
Clean code to try to fix #16123
2021-02-02 01:30:23 +01:00
Laurent Destailleur
daf88944f8
FIX #16118 Timezone problem on some fields
2021-02-02 00:19:41 +01:00
Laurent Destailleur
e6deed1601
Fix collapse
2021-02-01 15:40:59 +01:00
Gauthier PC portable 024
1eb4968a29
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-02-01 12:00:04 +01:00
Laurent Destailleur
641885d814
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-31 19:05:27 +01:00
Laurent Destailleur
582c37c378
Code comment
2021-01-31 19:05:07 +01:00
Laurent Destailleur
3801dd34cd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
2021-01-31 19:02:57 +01:00
Laurent Destailleur
d023afb66f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
2021-01-31 18:55:11 +01:00
Laurent Destailleur
18d222f32f
Fix code comment
2021-01-31 18:06:02 +01:00
Regis Houssin
5217a38359
FIX use post instead get
2021-01-31 12:51:13 +01:00
Laurent Destailleur
7887d4cc8e
Fix price2num on all GETPOST('remise_percent')
2021-01-31 12:48:40 +01:00
Regis Houssin
74795b87e5
FIX avoid undefined url and missing token
2021-01-31 12:46:54 +01:00
Laurent Destailleur
b24aac1e6b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
2021-01-31 12:03:39 +01:00
Laurent Destailleur
ca7738c9b3
FIX #16107
2021-01-30 13:57:42 +01:00
Laurent Destailleur
6fe5c2f599
Merge pull request #16109 from grandoc/new_branch_30_01_2021
...
missing declaration
2021-01-30 13:08:56 +01:00
Philippe GRAND
e584792382
missing declaration
2021-01-30 12:57:06 +01:00
Laurent Destailleur
1063b97c22
Close #16099 Close #16098
2021-01-30 12:55:38 +01:00
Philippe GRAND
0f19a11ebe
missing declaration
2021-01-30 12:54:10 +01:00
Laurent Destailleur
06b0b0ac66
Merge pull request #16102 from bb2a/bug_PROPOSALS_WITH_PICTURE
...
Bug Photo in propal
2021-01-30 12:51:33 +01:00
Anthony Berton
e48fc6c3d0
Update pdf_cyan.modules.php
2021-01-29 13:51:06 +01:00
Anthony Berton
77b0075d71
Update pdf_azur.modules.php
2021-01-29 10:50:11 +01:00
Anthony Berton
720a11877d
Update pdf_azur.modules.php
2021-01-29 10:48:58 +01:00
stickler-ci
400243a157
Fixing style errors.
2021-01-29 09:41:05 +00:00
Anthony Berton
fcf72d5e50
Update pdf_azur.modules.php
2021-01-29 10:35:48 +01:00
Laurent Destailleur
e5b4c76a26
Fix combo to select action status
2021-01-28 19:38:47 +01:00
Laurent Destailleur
db9b6b53da
NEW Can set a label as placeholder for combo lists.
2021-01-28 16:31:32 +01:00
Laurent Destailleur
9ec5ba46fb
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-28 14:47:06 +01:00
Laurent Destailleur
3eebbc6426
NEW Add function showValueWithClipboardCPButton() to add a copy/paste
...
button on a text.
2021-01-28 12:44:45 +01:00
Laurent Destailleur
ce3279c462
NEW Add function showValueWithCopyAndPasteButton() to add a copy/paste
...
button on a text.
2021-01-28 12:34:54 +01:00
Laurent Destailleur
cf4a12d715
FIX Missing language ico
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-28 12:04:04 +01:00
Laurent Destailleur
1a7f3938f2
FIX Missing language ico
2021-01-28 12:02:16 +01:00
Laurent Destailleur
4fbf2fff6f
Merge pull request #16034 from Hystepik/develop#2
...
Close #16027 New Feature copy Code Client
2021-01-28 11:17:10 +01:00
Laurent Destailleur
4d5cda20e7
Update functions.lib.php
2021-01-28 11:15:11 +01:00
Laurent Destailleur
9d0945bbe2
FIX #16077
2021-01-28 10:30:09 +01:00
Gauthier PC portable 024
8a5588e518
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-28 10:28:36 +01:00
Laurent Destailleur
f462e353e9
FIX #16079
2021-01-28 09:59:13 +01:00
Laurent Destailleur
b488bca020
FIX 16084
2021-01-28 08:53:13 +01:00
Florian Mortgat
8dfe39258b
FIX 11.0 - when a mandatory extrafield of type sellist contains '0' it should be considered empty and trigger an error message upon insertion
2021-01-27 23:46:09 +01:00
Laurent Destailleur
8c97b55548
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-27 21:09:13 +01:00
Laurent Destailleur
a4c0459c1e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/list.php
2021-01-27 21:09:01 +01:00
Laurent Destailleur
34ce398033
Merge pull request #16071 from atm-adrien/FIX/Linked_extrafields_alphaValue
...
FIX : Linked extrafields don't work with string value
2021-01-27 19:36:13 +01:00
Laurent Destailleur
3e4a9b1bfc
Merge pull request #16070 from aspangaro/13p3
...
Fix: Fa-icon on stock movement
2021-01-27 19:24:31 +01:00
Laurent Destailleur
7b41e0d60c
Merge pull request #16069 from aspangaro/13p2
...
Fix language & translation
2021-01-27 19:23:40 +01:00
Laurent Destailleur
8f8349c671
Merge pull request #16066 from frederic34/patch-1
...
fix include
2021-01-27 19:21:12 +01:00
Frédéric FRANCE
7cd698aff9
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-26 20:19:49 +01:00
Laurent Destailleur
1637b6af7d
Look and feel v14
2021-01-26 15:16:06 +01:00
Laurent Destailleur
aa2d581b41
Fix rename of alias
2021-01-26 13:38:41 +01:00
Laurent Destailleur
d7bf173f0d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/lib/functions.lib.php
test/phpunit/SecurityTest.php
2021-01-26 12:12:35 +01:00
Laurent Destailleur
977e4dde86
Fix regression
2021-01-26 12:08:54 +01:00
Laurent Destailleur
8db80ff44d
Fix reponsive
2021-01-26 11:19:13 +01:00
Adrien Raze
6ab63a10d6
FIX : Linked extrafields don't work with string value
2021-01-26 09:37:28 +01:00
Alexandre SPANGARO
0ef02880eb
Fix: Fa-icon on movement
2021-01-26 08:54:21 +01:00
Alexandre SPANGARO
94d4f2da8e
Missing language key & error translation
2021-01-26 05:14:01 +01:00
Laurent Destailleur
13378897a8
FIX Report by Ricardo Matias
...
Conflicts:
test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f
FIX Report by Ricardo Matias
2021-01-25 22:46:09 +01:00
Laurent Destailleur
b4be97ec15
Draft code
2021-01-25 18:59:04 +01:00
Frédéric FRANCE
22522f5aa2
fix include
2021-01-25 17:06:25 +01:00
Laurent Destailleur
0861c639ae
Fix sql injection
2021-01-25 12:40:52 +01:00
Laurent Destailleur
470cd5c682
Clean code
2021-01-25 12:39:44 +01:00
Laurent Destailleur
4b248263c8
Doxygen
2021-01-25 12:29:31 +01:00
Laurent Destailleur
0f5fc7353e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/admin/mailing.php
htdocs/admin/paymentbybanktransfer.php
htdocs/admin/prelevement.php
htdocs/modulebuilder/template/admin/setup.php
2021-01-24 15:29:53 +01:00
Laurent Destailleur
c5cda97c19
FIX Generation of aliases (main alias and alt alias into subdirs)
2021-01-24 14:34:29 +01:00
Laurent Destailleur
005292054d
FIX Generation of aliases (main alias and alt alias into subdirs)
2021-01-24 14:31:29 +01:00
Laurent Destailleur
d9908efdef
Code comment
2021-01-24 13:29:38 +01:00
Laurent Destailleur
15b818da30
Code comment
2021-01-24 13:27:52 +01:00
Laurent Destailleur
c5bbaffb50
Fix look and feel v13
2021-01-23 19:50:04 +01:00
Laurent Destailleur
452aea1d8b
Fix bad test
2021-01-23 17:59:56 +01:00
Laurent Destailleur
dd69aed27b
Fix error test
2021-01-23 17:49:08 +01:00
Laurent Destailleur
21e55d1542
NEW Can filter files in GED on status Shared/Not shared
2021-01-23 13:56:51 +01:00
Laurent Destailleur
8bd7ddee6b
Clean code
2021-01-23 13:55:56 +01:00
Laurent Destailleur
791f5f3f62
Fix css
2021-01-23 13:50:06 +01:00
lmarcouiller
cfcd51f291
style errors update
2021-01-22 17:03:39 +01:00
lmarcouiller
7685dee5f6
style changes
2021-01-22 16:59:34 +01:00
lmarcouiller
5a95cc16aa
update clipboardcopypaste with jquery
2021-01-22 16:58:47 +01:00
Laurent Destailleur
599d69b07c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-22 13:40:08 +01:00
Laurent Destailleur
e1b6f33894
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
2021-01-22 13:40:00 +01:00
Laurent Destailleur
d23e6646ed
Merge pull request #16030 from atm-adrien/FIX/Linked_extrafields_10.0
...
FIX : Linked extrafields lists
2021-01-22 13:35:56 +01:00
lmarcouiller
76ce77f7ba
stickler-ci edit
2021-01-22 09:13:04 +01:00
lmarcouiller
64d08544b2
move of function showValueWithCopyPasteButton in function.lib.php
2021-01-22 09:09:46 +01:00
Laurent Destailleur
7982cab526
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/modules/contract/doc/pdf_strato.modules.php
htdocs/ticket/card.php
2021-01-21 18:34:55 +01:00
lmarcouiller
60d6de86f1
change of line 1346 because miss remove
2021-01-21 14:31:18 +01:00
Laurent Destailleur
69479584ed
Fix $ok is not used
2021-01-21 13:50:31 +01:00
Laurent Destailleur
8e5b971c49
Merge pull request #15918 from zuiko/patch-1
...
Fix #15633 : Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
2021-01-21 13:33:47 +01:00
Laurent Destailleur
af438624a6
Update commonobject.class.php
2021-01-21 13:21:22 +01:00
Laurent Destailleur
0a55ba32f8
Merge branch 'develop' into FIX/Linked_extrafields_10.0
2021-01-21 13:20:34 +01:00
Adrien Raze
645685d16e
FIX : Linked extrafields list
2021-01-20 18:39:18 +01:00
BlackMirror
640cf50b7f
[FM] Fix 12.0 - duplicate label, probably mistaken for ref
2021-01-20 15:20:50 +01:00
Laurent Destailleur
113ef1a02b
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2021-01-19 16:21:53 +01:00
Laurent Destailleur
fd65a2adc1
FIX #15955
2021-01-19 16:04:21 +01:00
Laurent Destailleur
0917b37bb9
FIX #15966 #15967
2021-01-19 15:20:35 +01:00
Laurent Destailleur
7cb8d5af55
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-19 12:25:28 +01:00
Laurent Destailleur
f54efca075
Clean code
2021-01-19 12:25:05 +01:00
stickler-ci
0cdd9f8640
Fixing style errors.
2021-01-19 10:43:03 +00:00
zuiko
21fac1ff7a
Update mod_barcode_product_standard.php
...
Fix #15633 : Product creation: EAN13 barcode automatic generation incompatible with EAN13 existing barcode scanning, unusable function.
#15918
ok with @eldy
Avoid sql call if no joker at the end of mask
Treat EAN13 in a more evolutive code form to prepare needs for other barcodes with key
2021-01-19 11:40:53 +01:00
Frédéric FRANCE
e8c4db2188
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-19 11:36:59 +01:00
Laurent Destailleur
01996261dc
Merge pull request #15985 from frederic34/codesyntax
...
code syntax
2021-01-19 11:29:18 +01:00
Laurent Destailleur
7ad7ad9bb8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-19 10:43:31 +01:00
Laurent Destailleur
2c6d11e040
When creating invoice by mass action, message has link to invoice
2021-01-19 10:42:43 +01:00
lmarcouiller
afab5a977a
dolgrap.class.php with frederic34 advices 2
2021-01-19 09:43:06 +01:00
lmarcouiller
d69e36c110
Merge branch 'develop#1' of github.com:Hystepik/dolibarr into develop#1
2021-01-19 09:11:29 +01:00
lmarcouiller
82b688a2b0
dolgrap.class.php with frederic34 advices
2021-01-19 09:10:15 +01:00
lmarcouiller
fd888be5e5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#1
2021-01-19 09:05:08 +01:00
Gauthier PC portable 024
e2abbbcece
Merge branch '12.0_new_payments_on_vat' of github.com:atm-gauthier/dolibarr into NEW/add_real_payments_on_vat_objects
2021-01-19 08:57:24 +01:00
Frédéric FRANCE
36eeef81bf
code syntax
2021-01-19 00:41:39 +01:00
Laurent Destailleur
6d251e6a43
Merge pull request #15963 from FHenry/13.0
...
fix thirdparty list filter type_ent can be empty
2021-01-18 19:21:58 +01:00
David Bensel
9813cb430a
FIX: type 'sellist' not handled properly in showInputField and showOutputField
2021-01-18 19:14:12 +01:00
Laurent Destailleur
2baeec1537
Merge pull request #15964 from FHenry/12.0
...
extrafeild selllist can be use with string fk
2021-01-18 18:53:01 +01:00
Laurent Destailleur
7195a6880f
Merge pull request #15992 from atm-kevin/FIX/GETPOST_param_card_presend
...
FIX : missing GETPOST parameters on card_presend.tpl.php
2021-01-18 18:49:28 +01:00
Gauthier PC portable 024
2cfaf5fbd6
NEW : add real payments on vat objects
2021-01-18 17:08:17 +01:00
David Bensel
85d63891d9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2021-01-18 17:33:22 +03:00
David Bensel
b777a0660c
FIX: type 'sellist' not handled properly in showInputField and showOutputField
2021-01-18 17:31:49 +03:00
Laurent Destailleur
f95bf56c15
Fix translation
2021-01-18 15:24:50 +01:00
Laurent Destailleur
3ff720f8d0
Merge pull request #15999 from frederic34/boxdolibarrstat
...
fix unknown variable
2021-01-18 15:18:07 +01:00
Laurent Destailleur
5a4ab3d00e
Fix look and feel v13
2021-01-18 12:07:40 +01:00
stickler-ci
fe01f35207
Fixing style errors.
2021-01-18 10:33:46 +00:00
lmarcouiller
383281e5f3
New update of funnel of prospection
2021-01-18 11:32:02 +01:00
Laurent Destailleur
250b530b29
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
2021-01-18 11:07:46 +01:00
Laurent Destailleur
c69631d646
Fix css for multiselect component that are fist hidden
2021-01-18 11:05:02 +01:00
Florian HENRY
58eeb7152b
Merge branch '12.0' into 13.0
2021-01-18 09:19:05 +01:00
Florian HENRY
c4f8e81d5d
better fix
2021-01-18 09:18:42 +01:00
Florian HENRY
1cd0f71c09
Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12.0
2021-01-18 09:12:29 +01:00
Florian HENRY
33a0cf078c
better fix
2021-01-18 09:12:23 +01:00
Florian HENRY
014d3cc114
better fix
2021-01-18 09:08:54 +01:00
Florian HENRY
1eec6fbb8f
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-01-18 09:05:12 +01:00
Frédéric FRANCE
83b7e3c678
fix unknown variable
2021-01-18 08:01:18 +01:00
Frédéric FRANCE
f71d803da8
Merge remote-tracking branch 'upstream/develop' into codesyntax
2021-01-17 20:21:05 +01:00
Laurent Destailleur
62300689f8
Fix look and feel v13
2021-01-17 15:59:04 +01:00
Laurent Destailleur
2859070c5c
Fix filet on extrafields date
2021-01-17 15:47:43 +01:00
Laurent Destailleur
4d42fa2a37
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formaccounting.class.php
2021-01-17 11:34:19 +01:00
Frédéric FRANCE
c8d1410e33
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 21:06:12 +01:00
Laurent Destailleur
a4109d3fd0
Merge pull request #15600 from Hystepik/develop#2
...
Close #15384 : New widget stat database
2021-01-16 18:42:50 +01:00
Laurent Destailleur
8b9287055e
Update functions.lib.php
2021-01-16 18:34:25 +01:00
Frédéric FRANCE
177b87da0d
Merge remote-tracking branch 'upstream/develop' into codesyntax
2021-01-16 17:58:01 +01:00
Laurent Destailleur
506d809712
FIX #15991
2021-01-16 17:50:02 +01:00
Laurent Destailleur
fdeb2d2f9c
Merge pull request #15979 from frederic34/patch-8
...
member has ref now
2021-01-16 17:26:52 +01:00
Laurent Destailleur
d67e0621dd
Merge pull request #15994 from andreubisquerra/develop
...
FIX Avoid php errors if negative var in Receipt Module
2021-01-16 17:25:40 +01:00
Laurent Destailleur
f2488a399e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-16 17:13:54 +01:00
Laurent Destailleur
cdcc6b7324
Merge pull request #15974 from frederic34/davadmin
...
fix trans
2021-01-16 17:13:37 +01:00
Laurent Destailleur
ab1e49ab20
Merge pull request #15986 from aspangaro/13a27
...
Optimize select_auxaccount
2021-01-16 16:59:20 +01:00
Laurent Destailleur
8c8ffa3daf
Fix default limit
2021-01-16 16:56:49 +01:00
Laurent Destailleur
de6f6c9b5d
Update functions.lib.php
2021-01-16 16:51:47 +01:00
zuiko
32b5aa7790
Update functions.lib.php
...
Fix #15820
function price2num
add underscore and - in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.
I don't know if other characters have to be added to this pattern.
2021-01-16 16:51:27 +01:00
Laurent Destailleur
d00eb5b533
Merge pull request #15989 from zuiko/patch-3
...
Fix #15820 Bug: Unable to edit the pricing in Sales Order
2021-01-16 16:50:49 +01:00
Laurent Destailleur
e5c932d3f4
Update functions.lib.php
2021-01-16 16:50:34 +01:00
Laurent Destailleur
2f69a380be
Fix syntax error
2021-01-16 16:06:49 +01:00
Laurent Destailleur
04e669ec96
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/langs/fr_FR/other.lang
2021-01-16 15:38:34 +01:00
Laurent Destailleur
892bd432e4
Fix crop of image on invoices.
2021-01-16 15:35:15 +01:00
Frédéric FRANCE
2df0acd419
code syntax
2021-01-16 14:12:09 +01:00
Laurent Destailleur
68302d74ba
Fix look and feel v14
2021-01-16 14:10:37 +01:00
Frédéric FRANCE
216da52972
Merge remote-tracking branch 'upstream/develop' into patch-8
2021-01-16 14:00:05 +01:00
Frédéric FRANCE
871f762546
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-16 13:58:27 +01:00
Laurent Destailleur
4864808e4d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formmail.class.php
2021-01-16 13:45:34 +01:00
Laurent Destailleur
b3d7783a29
Fix multicompany compatibility of preview of file in email form
2021-01-16 13:41:27 +01:00
Laurent Destailleur
c7c74e8ed1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2021-01-15 19:53:46 +01:00
andreubisquerra
2f9f933ea8
FIX Avoid php errors if negative var in Receipt Module
2021-01-15 19:28:12 +01:00
Laurent Destailleur
d36c406074
Code comment
2021-01-15 19:24:53 +01:00
Laurent Destailleur
80ed651c5e
Fix GETPOST
2021-01-15 19:23:56 +01:00
Laurent Destailleur
ea266c1f2d
Fix missing alias
2021-01-15 17:59:08 +01:00
Laurent Destailleur
32bd194f8e
Sort array
2021-01-15 17:47:14 +01:00
Laurent Destailleur
4b66f6bcd3
Restrict list to customer and supplier only
...
Merge 2 sql request in to 1
2021-01-15 17:43:54 +01:00
Laurent Destailleur
0e636031ba
Add option
...
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:07:00 +01:00
Laurent Destailleur
9350774808
Add option
...
MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID
2021-01-15 16:06:22 +01:00
Laurent Destailleur
c778eafc4a
Fix very slow effect.
2021-01-15 14:54:23 +01:00
kevin
fb14f7c0b8
Modify GETPOST parameters to match with v12
2021-01-15 14:40:55 +01:00
Alexandre SPANGARO
0904212c0b
Better works
2021-01-15 14:19:41 +01:00
Laurent Destailleur
39b6f2fb6a
Revert. restore old behaviour, the picto before the input field lead to
...
confusion for some users and break presentation with some pages
2021-01-15 13:36:24 +01:00
Laurent Destailleur
dc9cd28437
Look and feel v14
2021-01-15 13:14:21 +01:00
Laurent Destailleur
4c50f25c12
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-15 11:41:45 +01:00
zuiko
dd9031432a
Update functions.lib.php
...
Fix #15820
function price2num
add underscore and - in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) for example where underscore or - can be used.
I don't know if other characters have to be added to this pattern.
2021-01-15 10:29:31 +01:00
Florian HENRY
cd62c9ed6d
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0
2021-01-15 08:11:30 +01:00
Alexandre SPANGARO
e812c200c5
Optimize select_auxaccount
2021-01-15 03:37:17 +01:00
Laurent Destailleur
0d704b0714
FIX error managent and db transaction balance
2021-01-14 19:09:57 +01:00
zuiko
fd5948f716
Update functions.lib.php
...
Fix #15820
Fix #15820
function price2num
add underscore in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_\-]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
it seems that some constantes use also "-" so I added it in the pattern.
I don't know if other characters have to be added to this pattern.
2021-01-14 15:00:53 +01:00
zuiko
727751e0c1
Update functions.lib.php
...
Fix #15820
function price2num
add underscore in the pattern in instruction
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>]/', '', $amount);
as this:
$amount = preg_replace('/[a-zA-Z\/\\\*\(\)\<\>\_]/', '', $amount);
in order to cover some constantes cases as 20% (TX_NORMAL) or 10% (TX_REDUIT) where underscore is used.
I don't know if other characters have to be added to this pattern.
2021-01-14 14:44:32 +01:00
Laurent Destailleur
aaddda9a6e
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/accountancy/class/accountancyexport.class.php
htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
d76aab4d08
Clean code and comment to have code easier to undestand.
2021-01-14 10:56:24 +01:00
Frédéric FRANCE
225c68d5e6
Update box_members.php
2021-01-13 22:00:40 +01:00
Frédéric FRANCE
923a5fe2a5
Merge remote-tracking branch 'upstream/develop' into davadmin
2021-01-13 18:45:29 +01:00
Laurent Destailleur
43161be711
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-13 17:45:38 +01:00
Laurent Destailleur
0af5c9ae91
Fix phpcs
2021-01-13 17:45:17 +01:00
Laurent Destailleur
7f04307adf
Merge branch 'develop' into develop#2
2021-01-13 17:40:21 +01:00
Frédéric FRANCE
40a45efb63
fix code
2021-01-13 16:23:54 +01:00
Frédéric FRANCE
cb7266d261
fix trans
2021-01-13 16:18:23 +01:00
Laurent Destailleur
b7402ecf3f
Merge branch 'develop' into NEW_product_customer_price_ref
2021-01-13 13:38:19 +01:00
Laurent Destailleur
015c5a028b
Doxygen
2021-01-13 12:45:23 +01:00
Laurent Destailleur
93a2edd8d9
Fix property not used
2021-01-13 12:21:26 +01:00
Laurent Destailleur
3bed2c91c7
Fix version
2021-01-13 12:20:32 +01:00
stickler-ci
432d45b289
Fixing style errors.
2021-01-13 11:19:39 +00:00
Laurent Destailleur
1571b0496c
Merge pull request #15794 from atm-gauthier/develop_new_workstation
...
NEW : Workstations management
2021-01-13 12:19:38 +01:00
Laurent Destailleur
1499998a99
Debug
2021-01-13 12:17:45 +01:00
Frédéric FRANCE
e2c57584b7
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-12 23:47:24 +01:00
Frédéric FRANCE
dad329602a
Update html.formmail.class.php
2021-01-12 23:46:29 +01:00
Frédéric FRANCE
cf24fd5d85
code syntax
2021-01-12 23:30:59 +01:00
zuiko
f718a396d5
Update mod_barcode_product_standard.php
...
$out .= $obj->libelle; //take the libelle corresponding to the type rowid in the database
Take the libelle instead the code for the litteral value of the barcode type rowid.
2021-01-12 21:59:09 +01:00
Florian HENRY
1cc88794b5
merge from 12.0 because this bug comme from it
2021-01-12 21:48:34 +01:00
Florian HENRY
34b792e9a2
betterfix
2021-01-12 21:44:18 +01:00
zuiko
364158c35b
Update mod_barcode_product_standard.php
...
Blank line after comment removed...
2021-01-12 21:24:55 +01:00
stickler-ci
14e3be630c
Fixing style errors.
2021-01-12 20:16:34 +00:00
zuiko
ff06798660
Update mod_barcode_product_standard.php
...
More evolving coding by testing the type of barcode in literal form.
Does not change deeply the #15918 correction principle in order to fix bug #15633 .
2021-01-12 21:14:43 +01:00
Laurent Destailleur
958b255822
Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param.
2021-01-12 21:06:02 +01:00
Laurent Destailleur
a7c78c2f60
Merge pull request #15960 from seblu/fix_ldap_login
...
Use login from LDAP attribute
2021-01-12 20:59:46 +01:00
Florian HENRY
f30b303269
Merge branch '12.0' into 13.0
2021-01-12 17:45:54 +01:00
Florian HENRY
5b21702508
extrafeild selllist can be use with string fk
2021-01-12 17:44:22 +01:00
Marc de Lima Lucio
82b0f18378
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-12 15:10:15 +01:00
Laurent Destailleur
2e9f3b803d
Add some hooks to add new buttons (compensation of removal of tabs).
...
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
2021-01-12 13:59:20 +01:00
Sébastien Luttringer
3f13dacacd
Use login from LDAP attribute
...
The LDAP authentication function (check_user_password_ldap) returns the login
sting when authentication is successful.
The current implementation always return the provided login to the check function,
instead of LDAP entry login field (as defined in the LDAP_FIELD_LOGIN).
This is problematic when you expect user to log with several login, like mail,
or the LDAP login doesn't match the dolibarr database.
For example, the following filter allows users auth with mail and cn ldap fields:
$dolibarr_main_auth_ldap_filter = '(&(objectClass=person)(|(cn=%1%)(mail=%1%)))';
but, dolibarr will not find the user when mail is provided.
This patch returns the $ldap->login when LDAP_FIELD_LOGIN is configured.
2021-01-12 12:07:36 +01:00
Florian HENRY
98eff62aff
Merge branch '13_backport' into dev_fix_contact_bulk
2021-01-12 10:25:18 +01:00
Florian HENRY
e34a797899
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_backport
2021-01-12 10:21:35 +01:00
Laurent Destailleur
3906acc951
Must use the generic version
2021-01-12 10:00:05 +01:00
Florian HENRY
21e1d5c8c9
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab
2021-01-11 18:07:10 +01:00
Laurent Destailleur
c2187b2ff1
Merge branch 'develop' into develop_new_workstation
2021-01-11 17:59:13 +01:00
Laurent Destailleur
cae9dc3acf
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion
...
NEW : Add contact tag and bulk email status on thirparty+contact create form
2021-01-11 17:28:12 +01:00
Laurent Destailleur
df3034d13a
Merge branch 'develop' into patch-1
2021-01-11 17:15:46 +01:00
Laurent Destailleur
238fd5accb
Merge pull request #15346 from ATM-Consulting/FIX_12.0_date_extrafields_are_not_filterable_on_lists
...
NEW Can filter on extrafields date on lists
2021-01-11 16:41:01 +01:00
Laurent Destailleur
307d718e82
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow
...
NEW : Workflow to set a shipment as closed
2021-01-11 16:34:26 +01:00
stickler-ci
f5fa7928ca
Fixing style errors.
2021-01-11 15:29:33 +00:00
Laurent Destailleur
5ee97dfd4a
Update mod_barcode_product_standard.php
2021-01-11 16:27:37 +01:00
Laurent Destailleur
9962c182c4
Merge pull request #15805 from FHenry/dev_exfields_of_lines_into_line_tr
...
NEW : Extrafields of documents lines are inside the lines, not any more on separate TR
2021-01-11 16:15:45 +01:00
Laurent Destailleur
f6de607889
Fix warning
2021-01-11 16:07:02 +01:00
Laurent Destailleur
9a5ae77615
Merge pull request #15926 from FHenry/develop
...
fix : remove php warning on install pages
2021-01-11 16:04:04 +01:00
Laurent Destailleur
ed00f6bfb9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:46:50 +01:00
Laurent Destailleur
f9f84f84ba
Fix rounding of foreign amount
2021-01-11 13:46:23 +01:00
Laurent Destailleur
5bd59cd6d1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-11 13:37:59 +01:00
Laurent Destailleur
8debb58f7c
Fix rounding of currency unit prices
2021-01-11 13:36:53 +01:00
Laurent Destailleur
5660159a6d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/bom/bom_card.php
2021-01-11 13:13:26 +01:00
Laurent Destailleur
c10072ccef
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-11 13:07:31 +01:00
Gauthier PC portable 024
6668cfa311
FIX : name in copyrights
2021-01-11 11:40:04 +01:00
Gauthier PC portable 024
e3e4f0590c
FIX : get and delete linked items with association tables methods created in common object
2021-01-11 11:36:19 +01:00
Gauthier PC portable 024
8dfb088fc5
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation
2021-01-11 10:34:38 +01:00
Florian HENRY
c7cddb19be
fix stickler
2021-01-10 11:58:22 +01:00
Florian HENRY
2a3a73c831
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-01-10 11:58:06 +01:00
Laurent Destailleur
f411b29b28
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbysubaccount.php
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/accountancy.lang
2021-01-09 02:34:43 +01:00
Laurent Destailleur
b3461161ec
Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH
2021-01-09 02:28:50 +01:00
zuiko
bcff65c3d3
Update mod_barcode_product_standard.php
...
get barcode type configuration for products only if $type not set
2021-01-09 01:01:14 +01:00
ATM-Nicolas
5a6e4f54f0
NEW : Workflow to set a shipment as closed
2021-01-08 16:25:54 +01:00
Florian Mortgat
d7d44e22e3
FIX warning when filtering on date extrafield (cannot concatenate array to string)
2021-01-08 10:30:39 +01:00
Florian Mortgat
6a759b4bd0
Merge branch 'refs/heads/develop' into FIX_12.0_date_extrafields_are_not_filterable_on_lists
2021-01-08 09:21:58 +01:00
Florian Mortgat
77933de467
Merge branch '12.0' into FIX_12.0_date_extrafields_are_not_filterable_on_lists
2021-01-08 09:08:52 +01:00
Florian Mortgat
5418fcd5be
[minor fix] remove useless intval()
2021-01-08 09:05:32 +01:00
Florian HENRY
7c08e3330c
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop
2021-01-07 17:54:49 +01:00
Florian HENRY
04d8a679a7
fix warning message on install
2021-01-07 17:51:45 +01:00
Florian HENRY
8adfe54949
bulk email management
2021-01-07 17:33:57 +01:00
Florian HENRY
9b1b755cc2
Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13_8fablab
2021-01-07 17:24:53 +01:00
Florian HENRY
5c53a963e2
bulk email management
2021-01-07 17:23:02 +01:00
Laurent Destailleur
2794327e10
Update box_birthdays.php
2021-01-07 12:50:14 +01:00
Lars Wallenborn
1880e51d1c
[FIX] sort order in birthday box
...
The current sort order is by date and not by day of month. This yields
the following unexpected results:
Given
* Person A, born on 1980-01-10
* Person B, born on 1970-01-30
I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
2021-01-07 12:50:07 +01:00
Laurent Destailleur
a498f8dfe1
Fix sort by day
2021-01-07 12:49:54 +01:00
Laurent Destailleur
094ea841db
Fix sort by day
2021-01-07 12:49:19 +01:00
Laurent Destailleur
28cb391924
Merge pull request #15922 from larsborn/develop
...
Fix sort order in birthday box
2021-01-07 12:47:30 +01:00
Laurent Destailleur
ddc3f35be1
Update box_birthdays.php
2021-01-07 12:47:16 +01:00
Laurent Destailleur
6da3ed1a51
Merge 2 exclusive options into 1
2021-01-07 12:39:51 +01:00
Lars Wallenborn
f578164b42
[FIX] sort order in birthday box
...
The current sort order is by date and not by day of month. This yields
the following unexpected results:
Given
* Person A, born on 1980-01-10
* Person B, born on 1970-01-30
I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
2021-01-07 11:43:11 +01:00
Laurent Destailleur
26fa8b45ac
Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product
...
NEW: preload product description on selection for customer propal/order/invoice
2021-01-07 11:19:53 +01:00
Laurent Destailleur
55b46ca149
Merge pull request #15318 from bafbes/abb120353
...
New: add notification on ACTION_CREATE event
2021-01-07 11:17:33 +01:00
Laurent Destailleur
4f55d51eac
Merge pull request #15886 from FHenry/dev_add_column_propal_order
...
NEW : Column shippement method, payment mode, payment term in propal and order list
2021-01-07 11:04:30 +01:00
Laurent Destailleur
3d2dc59468
Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment
...
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
2021-01-07 10:49:06 +01:00
Laurent Destailleur
3fa5c27bc7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-07 10:41:09 +01:00
Laurent Destailleur
e53cb4b530
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-07 10:40:58 +01:00
Laurent Destailleur
a1d20ed9c2
Merge pull request #15910 from atm-john/new/unit_type_selection_limit
...
NEW unit selection on object edit line
2021-01-07 10:33:07 +01:00
Laurent Destailleur
c2855d4d71
Update html.form.class.php
2021-01-07 10:32:23 +01:00
Laurent Destailleur
312f11d7b3
Update objectline_edit.tpl.php
2021-01-07 10:30:11 +01:00
Laurent Destailleur
73e69f8389
Update mod_barcode_product_standard.php
2021-01-07 10:23:38 +01:00
Laurent Destailleur
3399ab2c5d
Fix phpcs
2021-01-07 10:20:41 +01:00
Maxime Kohlhaas
1b7d194e18
Finish fix on add form values
2021-01-07 09:03:25 +01:00
stickler-ci
07ddb1fd2b
Fixing style errors.
2021-01-06 23:17:16 +00:00
zuiko
4e95108eb0
Update mod_barcode_product_standard.php
...
Fix #15633
2021-01-06 23:33:04 +01:00
Laurent Destailleur
8918299364
Update commonfields_add.tpl.php
2021-01-06 21:24:37 +01:00
Maxime Kohlhaas
42e45d4a7a
Fix date and datetime type in commonfield_add.tpl
2021-01-06 21:14:40 +01:00
Frédéric FRANCE
1e8362575a
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-06 21:05:59 +01:00
Laurent Destailleur
cfc2ec63f3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 21:04:13 +01:00
Laurent Destailleur
4c00167687
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/societe/card.php
2021-01-06 20:51:44 +01:00
Laurent Destailleur
07ca12b26d
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:48:23 +01:00
Laurent Destailleur
123bd81721
Trim no more required
2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b
FIX #15892 #15017
2021-01-06 20:41:40 +01:00
Laurent Destailleur
679948e207
Merge pull request #15893 from atm-lena/FIX_issue_15629
...
FIX #15629
2021-01-06 20:34:31 +01:00
Laurent Destailleur
71278b173e
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2021-01-06 20:27:46 +01:00
Laurent Destailleur
9e50a06f2b
Merge pull request #15894 from atm-john/11.0_fix_issue_14833
...
Fix #14833 A security mecanism generates data loss
2021-01-06 20:26:19 +01:00
Laurent Destailleur
b553dbb9d2
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-06 20:23:07 +01:00
Laurent Destailleur
a955df21bf
Merge pull request #15905 from atm-quentin/FIX/issue_14501
...
FIX useless tracking number displayed on pdf if empty issue #14501
2021-01-06 20:22:43 +01:00
Laurent Destailleur
3d96c5a454
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/bom/tpl/objectline_edit.tpl.php
htdocs/bom/tpl/objectline_view.tpl.php
htdocs/core/boxes/box_shipments.php
htdocs/societe/class/societe.class.php
2021-01-06 20:20:37 +01:00
Laurent Destailleur
17306bc715
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
...
Conflicts:
htdocs/core/boxes/box_shipments.php
2021-01-06 20:12:09 +01:00
Laurent Destailleur
7372a18283
Update box_shipments.php
2021-01-06 19:56:49 +01:00
ATM john
7fb0eb5756
fix stickler
2021-01-06 17:34:04 +01:00
ATM john
dd19da66b2
fix stickler
2021-01-06 17:33:19 +01:00
ATM john
ae7b8e7f5e
Fix unit selection on object edit line
2021-01-06 15:15:51 +01:00
stickler-ci
ca557cfacd
Fixing style errors.
2021-01-06 13:22:35 +00:00
quentin
e44b14364a
FIX useless tracking number displayed on pdf if empty
2021-01-06 14:17:06 +01:00
ATM john
50b5226d10
FIX #15465 External user sees last 5 shipments to other customers in the dashboard
2021-01-06 12:40:38 +01:00
Regis Houssin
f80a476bc5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-06 11:37:56 +01:00
kamel
32109de67b
NEW : Add triggers OBJECT_LINK_INSERT, OBJECT_LINK_UPDATE et OBJECT_LINK_DELETE in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
2021-01-06 11:14:13 +01:00
ATM john
92a4314779
Fix security mecanism generating data loss
2021-01-06 10:45:54 +01:00
atm-lena
6f15683709
FIX create ticket : thirdparty/contact notification #15629
2021-01-06 10:42:48 +01:00
Florian HENRY
6e7172887a
Merge branch '13_backport' into dev_add_column_propal_order
2021-01-05 22:58:00 +01:00
Florian HENRY
b9bb48a01f
better place and noadmininfo
2021-01-05 22:50:54 +01:00
Laurent Destailleur
ba68c958e1
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 19:12:57 +01:00
lmarcouiller
6aa2241617
Merge remote-tracking branch 'doligithub/develop' into develop#2
2021-01-05 18:07:34 +01:00
Marc de Lima Lucio
f03f5701f6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_product_customer_price_ref
2021-01-05 16:01:31 +01:00
Florian HENRY
f953ff0334
fix sticker
2021-01-05 15:25:47 +01:00
Florian HENRY
a2a45c6aa0
fix sticker
2021-01-05 15:22:31 +01:00
Florian HENRY
27c32560c6
Merge develop
2021-01-05 14:46:50 +01:00
Laurent Destailleur
4b45c5e723
Trans
2021-01-05 12:29:13 +01:00
Laurent Destailleur
a93227ac2f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:25 +01:00
Laurent Destailleur
ed25b252b9
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-05 11:30:14 +01:00
Laurent Destailleur
40645ea24d
Fix load lang
2021-01-05 10:39:53 +01:00
Regis Houssin
ec6c14beb8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-05 09:41:52 +01:00
Laurent Destailleur
7efd8add39
Merge pull request #15878 from frederic34/patch-10
...
doxygen
2021-01-05 01:41:02 +01:00
Frédéric FRANCE
eeaac549e2
doxygen
2021-01-05 00:11:19 +01:00
Frédéric FRANCE
c468db5a7c
doxygen
2021-01-04 23:41:20 +01:00
Florian HENRY
86075a4db9
review code
2021-01-04 20:00:57 +01:00
Florian HENRY
88ff52a82b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr
2021-01-04 19:20:34 +01:00
Frédéric FRANCE
8454100e7a
Merge remote-tracking branch 'upstream/develop' into boxindex
2021-01-04 17:45:36 +01:00
Laurent Destailleur
c58451dbb6
Code comment
2021-01-04 16:07:54 +01:00
Laurent Destailleur
07a3367f52
Merge pull request #15624 from StephaneLesage/edit-extrafield-computed-multiline
...
Create/Edit extra-field computed value with multi-line text area
2021-01-04 15:57:50 +01:00
Laurent Destailleur
e488f94af3
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
2021-01-04 15:39:48 +01:00
Laurent Destailleur
7141fa315e
Debug v13
2021-01-04 15:32:18 +01:00
Laurent Destailleur
b3142c3250
Merge pull request #15859 from frederic34/htmlformmail_doxygen
...
doxygen
2021-01-04 14:08:51 +01:00
Laurent Destailleur
4d09d3a576
Merge pull request #15860 from fappels/13_debug_shipments
...
Some debug on Shipments and reception.
2021-01-04 14:06:52 +01:00
Laurent Destailleur
ef76c067e0
Add limit to 25000
2021-01-04 13:37:21 +01:00
Laurent Destailleur
8baa4c67ae
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-04 12:34:09 +01:00
Laurent Destailleur
5c104e344c
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/lib/admin.lib.php
htdocs/ticket/list.php
2021-01-04 12:17:59 +01:00
Laurent Destailleur
66bd040d2c
Fix regression
2021-01-04 12:08:14 +01:00
Laurent Destailleur
bb22f2ccaf
Update admin.lib.php
2021-01-04 12:02:41 +01:00
Laurent Destailleur
b0738643fb
FIX Solve problem with TZ
2021-01-03 18:42:45 +01:00
Maxime Kohlhaas
e190b010d3
Fix dict contact type element list
2021-01-03 16:05:04 +01:00
Laurent Destailleur
645b7694c9
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/core/db/DoliDB.class.php
2021-01-03 15:26:31 +01:00
Florian HENRY
dfaf77b03f
merge develop
2021-01-03 15:14:34 +01:00
Laurent Destailleur
f462f68056
Code comment
2021-01-03 15:10:33 +01:00
Alexandre SPANGARO
43423650cd
NEW: Accountancy - Add closure menu in auguria menu
2021-01-03 11:57:40 +01:00
Alexandre SPANGARO
a8ecea1a89
NEW: Accountancy - Add closure menu in stable version
2021-01-03 11:54:50 +01:00
Frédéric FRANCE
7291bf34f0
boxes
2021-01-02 22:29:23 +01:00
Frédéric FRANCE
dc6c1b8d3b
boxes
2021-01-02 22:12:19 +01:00
Frédéric FRANCE
bd762bc58f
boxes
2021-01-02 21:50:58 +01:00
Frédéric FRANCE
8f3e6df3e1
transform into box
2021-01-02 21:03:04 +01:00
Frédéric FRANCE
96fbee5eaf
transform into box
2021-01-02 21:01:47 +01:00
Frédéric FRANCE
5dd0b3b1c6
can add box on user home page
2021-01-02 20:20:22 +01:00
Frédéric FRANCE
6fad38db57
can add box on member index page
2021-01-02 20:04:40 +01:00
Florian HENRY
b6d91526ee
Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr
2021-01-02 17:58:34 +01:00
Francis Appels
ade0e008e9
Some debug on Shipments.
...
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
2021-01-02 17:42:33 +01:00
Regis Houssin
3b7f5a92cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 17:20:24 +01:00
Frédéric FRANCE
eb937f82c8
doxygen
2021-01-02 16:58:05 +01:00
Laurent Destailleur
7f0f72ca47
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:18 +01:00
Laurent Destailleur
1ab459e854
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-02 16:19:08 +01:00
Laurent Destailleur
ce0abd17fe
Debug v13
2021-01-02 16:18:16 +01:00
Alexandre SPANGARO
2727fd70b7
FIX: Accountancy - Debug experimental function to validate movements
2021-01-02 14:00:24 +01:00
Regis Houssin
e36ae4ac90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2021-01-02 13:14:30 +01:00
Frédéric FRANCE
b71e837ddd
clean code
2021-01-02 10:18:58 +01:00
Frédéric FRANCE
2894dac221
clean code
2021-01-02 10:17:11 +01:00
Frédéric FRANCE
5e692fa9db
doxygen
2021-01-02 09:47:29 +01:00
Frédéric FRANCE
4643e41282
remove unused code
2021-01-02 09:35:57 +01:00
Laurent Destailleur
b88ee6eff4
Merge pull request #15815 from FHenry/dev_add_tag_on_massaction
...
NEW: Add mass action add tag for product/service, user, thirdparty, warehouse, project, bank account, members
2021-01-01 21:36:15 +01:00
Laurent Destailleur
0241817217
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2021-01-01 21:12:36 +01:00
Laurent Destailleur
71e4a672f5
Merge branch 'develop' into develop_patch-1
2021-01-01 20:52:43 +01:00
Laurent Destailleur
d834f6023d
Fix rounding
2020-12-31 16:06:54 +01:00
Laurent Destailleur
f756f575a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-31 15:19:49 +01:00
Laurent Destailleur
e4600b2091
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-31 15:17:03 +01:00
Laurent Destailleur
9e8c6eb0a1
FIX #15849
2020-12-31 15:05:17 +01:00
stickler-ci
327ec211c4
Fixing style errors.
2020-12-31 09:49:27 +00:00
Frédéric FRANCE
a5e0352031
modify animation speed of tooltips
2020-12-30 21:18:12 +01:00
Regis Houssin
07dc29166e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-30 13:56:50 +01:00
Laurent Destailleur
92a88441ac
Merge pull request #15328 from FHenry/dev_multifilter_jounal_on_bookeping
...
Dev multifilter jounal on bookeping
2020-12-30 13:19:27 +01:00
Laurent Destailleur
7165bd43d9
Update modAccounting.class.php
2020-12-30 13:17:57 +01:00
Laurent Destailleur
8149478c77
Merge pull request #15308 from aspangaro/14a2
...
NEW: Dictionary for availability - Add column position
2020-12-30 13:12:27 +01:00
Laurent Destailleur
17b68a30d7
Merge branch 'develop' into dev_add_tag_on_massaction
2020-12-30 13:10:02 +01:00
Regis Houssin
7832fa213f
FIX Stickler line exceeds 500 characters; contains 527 characters
2020-12-30 11:34:59 +01:00
Regis Houssin
7c5248d105
FIX and the world turn again
2020-12-30 11:27:03 +01:00
Regis Houssin
aec01a95fc
FIX again and again
2020-12-29 17:48:52 +01:00
Regis Houssin
acabb045fb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
2020-12-29 17:12:18 +01:00
Laurent Destailleur
057945f693
Fix bad var
2020-12-29 17:04:39 +01:00
Laurent Destailleur
740cedeaac
Merge pull request #15824 from frederic34/scheduledjobs
...
remove warnings
2020-12-29 17:03:17 +01:00
Regis Houssin
325c2b03f8
FIX step by step
2020-12-29 17:02:35 +01:00
Laurent Destailleur
cefd66c18f
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-29 16:56:39 +01:00
Regis Houssin
20cd9cbbc7
FIX avoid warning php 8.0
2020-12-29 16:25:29 +01:00
Regis Houssin
6e0832fb38
FIX WIP avoid warning with php 8.0
2020-12-29 15:59:39 +01:00
Alexandre SPANGARO
9f0434eb69
Merge remote-tracking branch 'upstream/develop' into 14a2
2020-12-29 04:50:32 +01:00
Laurent Destailleur
af41c06822
Fix warnings
2020-12-29 04:27:16 +01:00
Laurent Destailleur
7b93c34c0f
Fix phpunits
2020-12-29 03:48:11 +01:00
Florian HENRY
b3dae016af
fix sticker
2020-12-28 21:38:17 +01:00
Florian HENRY
1e438b686e
fix stickler
2020-12-28 21:32:46 +01:00
Florian HENRY
806b40662f
merge develop
2020-12-28 21:15:25 +01:00
Frédéric FRANCE
08bad6fc30
remove warnings
2020-12-28 20:54:29 +01:00
Laurent Destailleur
8b696ced3b
Clean code
2020-12-28 12:38:33 +01:00
Laurent Destailleur
4b3cd947f2
Fix name of function
2020-12-28 12:33:00 +01:00
Laurent Destailleur
cec96b33ae
Fix warning
2020-12-28 12:30:59 +01:00
Laurent Destailleur
4a8e72c997
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/ecm/file_card.php
2020-12-27 21:00:07 +01:00
Laurent Destailleur
4ec78d029b
Fix warning
2020-12-27 19:21:37 +01:00
Laurent Destailleur
7178918cb4
Merge pull request #15476 from StephaneLesage/fix-edit-category
...
Fix edition of tag/category which used type parameter instead of object's type
2020-12-27 15:08:50 +01:00
Laurent Destailleur
1546805b9e
Merge pull request #15500 from frederic34/patch-10
...
NEW add db fields note_public note_private for ecm
2020-12-27 15:07:51 +01:00
stickler-ci
7f1d0b9dc2
Fixing style errors.
2020-12-24 14:06:55 +00:00
Florian HENRY
1b6a4fc4ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_add_tag_on_massaction
2020-12-24 15:00:15 +01:00
Florian HENRY
79fe5ee34c
actioncomm ok
2020-12-24 14:35:40 +01:00
Laurent Destailleur
a0440fbe88
Removed warnings
2020-12-24 03:06:52 +01:00
Laurent Destailleur
5ef3ffbdc6
Fix warning
2020-12-24 03:03:38 +01:00
Laurent Destailleur
6c2a17b29a
Fix warning
2020-12-24 02:59:00 +01:00
Laurent Destailleur
3586da75a2
Fix warning
2020-12-24 02:52:49 +01:00
Florian HENRY
720539ff46
on goung
2020-12-23 23:52:43 +01:00
Florian HENRY
055a2b6fec
on goung
2020-12-23 23:44:38 +01:00
Florian HENRY
26d3ea2227
on going
2020-12-23 23:32:50 +01:00
Laurent Destailleur
02daf09928
Fix for php8
2020-12-23 23:06:34 +01:00
Laurent Destailleur
4471d7d1da
FIX debug report expense/income
2020-12-23 22:18:38 +01:00
Laurent Destailleur
d65dc85a10
FIX for php 8
2020-12-23 19:16:25 +01:00
Laurent Destailleur
1c73d38093
Fix api to download for shipments
2020-12-23 19:16:15 +01:00
Laurent Destailleur
9007e7be2a
Fix sql for postgresql
2020-12-23 16:13:45 +01:00
Laurent Destailleur
70df6130b5
Fix SQL to export categories of contact
...
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/product/class/product.class.php
2020-12-23 15:45:33 +01:00
Laurent Destailleur
bf606ede12
Enhance remote ip detection
2020-12-23 13:27:30 +01:00
Laurent Destailleur
335eefe620
Fix link
2020-12-23 13:26:39 +01:00
Laurent Destailleur
53c6d92b0b
Enhance remote ip detection
2020-12-23 13:17:40 +01:00
Florian HENRY
0c8939f46c
modifié : htdocs/core/tpl/objectline_create.tpl.php
...
modifié : htdocs/core/tpl/objectline_edit.tpl.php
2020-12-22 22:00:51 +01:00
Florian HENRY
311a555cc0
Merge github.com:Dolibarr/dolibarr into dev_exfields_of_lines_into_line_tr
2020-12-22 12:52:14 +01:00
Florian HENRY
fefc9040ab
NEW : Display extrafields (for lines/det into line tr instead of ugly other tr
2020-12-22 12:52:01 +01:00
Florian Mortgat
64a62bf2c2
FIX (PR #15346 comment) use dol_mktime, not mktime
2020-12-22 09:37:30 +01:00
Laurent Destailleur
04d249cef0
Merge pull request #15792 from frederic34/notifications
...
simplify notications class
2020-12-21 18:14:04 +01:00
Laurent Destailleur
88837df442
Merge pull request #15790 from frederic34/fixphpcs_2020_12
...
fix phpcs
2020-12-21 18:10:01 +01:00
Laurent Destailleur
dfb632f2d5
Fix phpunit
2020-12-21 17:56:31 +01:00
Laurent Destailleur
4bc0b46556
css
2020-12-21 17:33:57 +01:00
Laurent Destailleur
14223d74bd
Fix css
2020-12-21 15:00:29 +01:00
Laurent Destailleur
7d0e71165a
Clean code
2020-12-21 14:40:27 +01:00
Gauthier PC portable 024
5116337e0b
FIX : stickler feedbacks
2020-12-21 13:29:44 +01:00
Gauthier PC portable 024
7b739920a2
NEW : Workstations management
2020-12-21 12:28:45 +01:00
Laurent Destailleur
6937ab75fa
Fix test
2020-12-21 02:31:19 +01:00
Laurent Destailleur
0a19f3cf5b
css
2020-12-21 02:27:05 +01:00
Laurent Destailleur
5dc6f5b89f
Prepare 13.0
2020-12-21 01:33:06 +01:00
Laurent Destailleur
0a1387e673
Debug v13
2020-12-20 18:41:54 +01:00
Laurent Destailleur
7fae5ea800
Code clean
2020-12-20 18:21:34 +01:00
Laurent Destailleur
361f13154b
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions2.lib.php
htdocs/fourn/card.php
htdocs/margin/tabs/thirdpartyMargins.php
htdocs/societe/card.php
htdocs/societe/note.php
htdocs/societe/notify/card.php
htdocs/societe/societecontact.php
htdocs/ticket/list.php
2020-12-20 14:31:54 +01:00
Laurent Destailleur
8c87050703
FIX Check of customer/vendor code fails in some cases
2020-12-20 13:54:02 +01:00
Frédéric FRANCE
b7b35f4cd4
simplify notications class
2020-12-20 11:04:21 +01:00
Laurent Destailleur
8d21eab6ab
Fix buttond not working
2020-12-20 06:06:24 +01:00
Laurent Destailleur
6066a92b9d
Fix API to get country
2020-12-19 22:34:33 +01:00
Laurent Destailleur
ef4a816c56
CSS
2020-12-19 15:56:21 +01:00
Laurent Destailleur
b6bb08ec2e
Fix management of hreflang
2020-12-19 13:44:15 +01:00
Laurent Destailleur
fe93ee4d08
Debug website module for multilanguage
2020-12-19 13:03:40 +01:00
Laurent Destailleur
0eaf924d3b
Add warning on non https website to axplain why features is broken
2020-12-18 15:08:00 +01:00
Laurent Destailleur
832db82fce
Fix warnings
2020-12-18 14:40:45 +01:00
Laurent Destailleur
90d8299c92
Fix purge tool
2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f10c69680c
Ajax combo at a better place (after select)
2020-12-17 21:42:10 +01:00
Laurent Destailleur
a67068ab7b
Fix warnings
2020-12-17 18:08:56 +01:00
Laurent Destailleur
e41898280d
Merge pull request #15774 from aspangaro/13b3
...
Fix module intracommreport
2020-12-17 13:55:02 +01:00
Laurent Destailleur
075181a8d5
Look and feel v13
2020-12-17 12:25:50 +01:00
Laurent Destailleur
d0cc93c608
Fix look and feel v13
2020-12-17 12:09:12 +01:00
Laurent Destailleur
b0d524beed
Debug v13
2020-12-17 11:57:12 +01:00
Laurent Destailleur
36e0f07090
Remove warning
2020-12-17 08:52:39 +01:00
Alexandre SPANGARO
440c9e4840
Fix module Intracomm
2020-12-17 06:02:28 +01:00
Laurent Destailleur
9c759e91f0
Fix debug management of docs in ticket module
2020-12-16 19:01:26 +01:00
Laurent Destailleur
82710e54a8
Fix get custom odt templates
2020-12-16 18:10:40 +01:00
Laurent Destailleur
e7dda7bb4f
Move help into tooltip help section
2020-12-16 15:46:54 +01:00
Laurent Destailleur
93b9061a71
Merge pull request #15698 from StephaneLesage/export-categories
...
FIX: missing imports/exports of categories
2020-12-16 15:30:00 +01:00
Laurent Destailleur
2c7d872320
Fix warning
2020-12-16 11:07:34 +01:00
Laurent Destailleur
834058a816
Debug api to create a document
2020-12-16 02:33:21 +01:00
StephaneLesage
49225f3f57
Fix /categories/info.php navigation
2020-12-15 20:17:37 +01:00
Stephane Lesage
7853e77d3f
Export/Import categories missing fields and clean
2020-12-15 19:53:47 +01:00
Stephane Lesage
695eacf099
Create/Edit extra-field with multi-line text area for computed value
2020-12-15 19:52:55 +01:00
Laurent Destailleur
812fd22629
Merge branch 'develop' into develop#2
2020-12-15 14:09:29 +01:00
Laurent Destailleur
05cb2653f3
Merge pull request #15749 from StephaneLesage/companycard-directedit-type
...
Direct edition of type of company in card
2020-12-15 13:54:06 +01:00
Laurent Destailleur
4856cdb45c
Merge pull request #15752 from davidNDU/develop
...
Module builder made module needs this fix
2020-12-15 13:47:36 +01:00
Laurent Destailleur
a2bd920371
Fix translation of units
2020-12-15 11:39:18 +01:00
Laurent Destailleur
2ae1aac5a4
Fix setup
2020-12-15 11:18:29 +01:00
Laurent Destailleur
f2a4f880ca
Fix warning
2020-12-15 10:49:07 +01:00
Laurent Destailleur
1624b8636f
Show timeone
2020-12-15 10:43:19 +01:00
Laurent Destailleur
d3ba87b09a
Better gantt
2020-12-15 02:32:56 +01:00
Laurent Destailleur
55deccf364
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-14 23:20:21 +01:00
David Bensel
81d47d7460
action=confirm_deleteline ... method_exists has object as first parameter
2020-12-14 23:17:58 +03:00
David Bensel
bc9f7c83f4
update
2020-12-14 22:40:47 +03:00
Laurent Destailleur
098f51413f
Fix translation
2020-12-14 20:33:27 +01:00
Laurent Destailleur
2d343ab016
Fix
2020-12-14 20:01:17 +01:00
Laurent Destailleur
9595504b56
Fix graph
2020-12-14 19:57:59 +01:00
Laurent Destailleur
5f9b53004b
Fix warning
2020-12-14 17:40:40 +01:00
Laurent Destailleur
8114e86cf9
Fix phpcs
2020-12-14 13:40:30 +01:00
Laurent Destailleur
e612f53494
Fix warning
2020-12-14 13:01:25 +01:00
Laurent Destailleur
107e58403a
Fix position of captcha
2020-12-14 12:54:54 +01:00
Laurent Destailleur
b0e3f1678f
Debug v13
2020-12-14 10:58:09 +01:00
Laurent Destailleur
cce0b2f31b
Fix code
2020-12-14 10:44:51 +01:00
stickler-ci
d32d3060cc
Fixing style errors.
2020-12-14 09:15:06 +00:00
Stephane Lesage
5e4cc7fcfd
companycard-directedit-typent
2020-12-14 10:14:31 +01:00
Laurent Destailleur
d739fa1951
Fix log
2020-12-13 18:32:55 +01:00
Laurent Destailleur
acb73966f7
Clean code. Removed phpexcel library.
2020-12-13 16:27:44 +01:00
Laurent Destailleur
3d33d3aa3a
Fix warning
2020-12-13 14:36:00 +01:00
Laurent Destailleur
427fb16256
Fix warning
2020-12-13 13:29:47 +01:00
Laurent Destailleur
16ae3b83f9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-12-13 13:02:59 +01:00
Laurent Destailleur
ac34fce015
Merge pull request #15696 from StephaneLesage/12importexporticonslabels
...
Fix & sync import/export entity icons/labels translation
2020-12-13 12:50:30 +01:00
Laurent Destailleur
8a0d3e3f6f
Fix warning
2020-12-13 12:38:47 +01:00
Frédéric FRANCE
346fe8ae85
clean
2020-12-12 22:35:51 +01:00
Frédéric FRANCE
6c3a9cbc40
clean
2020-12-12 21:27:56 +01:00
Laurent Destailleur
3521a736fc
Fix warnings
2020-12-12 19:49:13 +01:00
Laurent Destailleur
75570cc984
Merge pull request #15743 from frederic34/mycompanysocialnetworks
...
Mycompany social networks separate tab
2020-12-12 19:21:29 +01:00
Laurent Destailleur
d19cdae980
Merge pull request #15727 from frederic34/patch-8
...
add option hide topmenu in Config/Display
2020-12-12 18:48:11 +01:00
Laurent Destailleur
96c1429713
Merge pull request #15741 from frederic34/socialnetworkslink
...
Socialnetworkslink
2020-12-12 18:42:00 +01:00
Laurent Destailleur
fa05982a8b
Fix CSS v13
2020-12-12 18:37:51 +01:00
Frédéric FRANCE
621f246d58
my company social networks in a separate tab
2020-12-12 18:26:54 +01:00
Frédéric FRANCE
643b507a96
ucfirst
2020-12-12 17:31:10 +01:00
Frédéric FRANCE
46bf871127
target
2020-12-12 17:23:42 +01:00
Frédéric FRANCE
d523ed9f85
socialnetworks links
2020-12-12 17:01:25 +01:00
Frédéric FRANCE
4664ac1a1c
socialnetworks links
2020-12-12 17:00:23 +01:00
Laurent Destailleur
b452852b30
Fix phpcs
2020-12-12 16:35:30 +01:00
Laurent Destailleur
7fdae69546
Fix warning
2020-12-12 14:11:50 +01:00
Laurent Destailleur
a3d302d91c
Debug v13
2020-12-12 13:58:21 +01:00
Laurent Destailleur
0968c68cf9
Enhance widget
2020-12-12 12:45:43 +01:00
Laurent Destailleur
33bb1919f0
Merge branch 'develop' into develop#3
2020-12-12 12:23:33 +01:00
