Laurent Destailleur
0766097658
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-04 19:28:24 +01:00
Laurent Destailleur
a6d340a22c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Laurent Destailleur
deda6252f2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/class/expensereport.class.php
2020-03-04 19:22:30 +01:00
stickler-ci
92cc947623
Fixing style errors.
2020-03-04 12:41:52 +00:00
Tobias Sekan
f823feba52
Add sorting for "Contacts of ..."
2020-03-04 13:31:19 +01:00
atm-arnaud
834873ab15
FIX date order was -1D and desc with label repetition
2020-03-04 11:58:42 +01:00
Laurent Destailleur
50d76ae0e8
FIX Bad permission to access menu Statistics on intervention.
2020-03-04 11:51:32 +01:00
Laurent Destailleur
2b65dff8a2
FIX Bad permission to access menu Statistics on intervention.
2020-03-04 11:48:43 +01:00
Laurent Destailleur
7d0d0aa75a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
2020-03-04 01:56:50 +01:00
Laurent Destailleur
5f417039f6
More log to help debug
2020-03-04 00:38:43 +01:00
Laurent Destailleur
537d129627
Merge pull request #13251 from bb2a/patch-20
...
NEW Add subtitution variables for url of document in backoffice
2020-03-03 23:13:53 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Anthony Berton
2fd7276a30
Update functions.lib.php
2020-03-03 09:53:00 +01:00
Laurent Destailleur
760afd6838
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-03-02 23:28:12 +01:00
Laurent Destailleur
481ea6296e
No more need fo this constant. Use the generic default feature instead
2020-03-02 23:28:01 +01:00
Laurent Destailleur
55093f9ff2
Merge pull request #13232 from TobiasSekan/NewCategoriesInStocks
...
NEW Category filter for warehouse list
2020-03-02 22:50:08 +01:00
Laurent Destailleur
ea7c2aa46b
Update functions.lib.php
2020-03-02 21:47:36 +01:00
Laurent Destailleur
6d01aee2f2
Merge pull request #13246 from Dolibarr/11.0
...
Can process lang files with windows format (even if all lang files must have linux format)
2020-03-02 21:46:27 +01:00
Laurent Destailleur
05556a77af
Fix css
2020-03-02 19:37:16 +01:00
Anthony Berton
d9a002a8bd
Update functions.lib.php
2020-03-02 19:27:36 +01:00
Anthony Berton
197f81cb52
Update functions.lib.php
2020-03-02 19:23:45 +01:00
Anthony Berton
12b9897f5c
Update functions.lib.php
2020-03-02 18:53:52 +01:00
Laurent Destailleur
db96634339
Fix trans
2020-03-02 18:50:21 +01:00
Laurent Destailleur
91e8df5c9b
Fix canonical name
2020-03-02 18:43:44 +01:00
Laurent Destailleur
390c0ce4dc
Fix main language is not into subdir
2020-03-02 18:41:30 +01:00
Laurent Destailleur
fab39aef9e
Clean menu bar
2020-03-02 17:35:49 +01:00
Laurent Destailleur
bb79c2cbd9
Fix links
2020-03-02 17:06:22 +01:00
Laurent Destailleur
dea1f1b19f
Fix link
2020-03-02 17:00:51 +01:00
Laurent Destailleur
8928a84c53
Fix link to medias
2020-03-02 16:56:54 +01:00
Regis Houssin
e962afb9c5
FIX modFournisseur is required by modSupplierProposal
2020-03-02 14:10:37 +01:00
Sekan, Tobias
f325c63055
Merge branch 'NewCategoriesInStocks' of https://github.com/TobiasSekan/dolibarr into NewCategoriesInStocks
2020-03-01 14:50:27 +01:00
Sekan, Tobias
754058b990
Fix lint errors
2020-03-01 14:50:22 +01:00
stickler-ci
a6b2531fd0
Fixing style errors.
2020-03-01 13:46:49 +00:00
Sekan, Tobias
0e55495c3e
adress feedback
2020-03-01 14:45:51 +01:00
Alexandre SPANGARO
6982997de5
Fix error
2020-03-01 05:09:57 +01:00
Alexandre SPANGARO
d9b9913e8a
NEW: Accountancy - Add mode intra & export for product or service bought
2020-03-01 04:52:12 +01:00
Laurent Destailleur
f2dba4f621
Merge pull request #13227 from aspangaro/12.0_a16
...
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-29 13:02:43 +01:00
Laurent Destailleur
bb5b55f9e3
Merge pull request #13225 from prietojc/patch-13
...
Update translate.class.php
2020-02-29 12:58:32 +01:00
Laurent Destailleur
f0d2f33e38
Merge pull request #13231 from defrance/patch-148
...
FIX: checkbox fields not updated when unchecked
2020-02-29 12:54:25 +01:00
Laurent Destailleur
8879672122
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 12:52:18 +01:00
Laurent Destailleur
0855598c00
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/lib/functions.lib.php
2020-02-29 12:51:33 +01:00
Laurent Destailleur
00483e4e85
NEW Add hook getInputIdProf. Better solution for #13228
2020-02-29 12:32:27 +01:00
Laurent Destailleur
dea8525a6c
NEW X-Axis on graph are show vertical when there is a lot of values.
2020-02-29 01:26:24 +01:00
Laurent Destailleur
f0d458682d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-29 00:15:17 +01:00
Laurent Destailleur
e35bba358f
Fix error when generating documents
2020-02-29 00:13:42 +01:00
Laurent Destailleur
acb3fb2cd8
Fix extrafields on x-axis
2020-02-29 00:11:19 +01:00
Laurent Destailleur
c6b6b97ac0
FIX Free input for email no more visible
2020-02-28 20:25:17 +01:00
Laurent Destailleur
56704e4029
Add stats of products in MO
2020-02-28 19:26:52 +01:00
Laurent Destailleur
bfb9739ae8
Fix manufacuring efficiency on bom lines.
2020-02-28 16:12:42 +01:00
stickler-ci
89048ca52e
Fixing style errors.
2020-02-28 14:49:10 +00:00
BENKE Charlene
50b3c760dd
Update actions_addupdatedelete.inc.php
2020-02-28 15:47:26 +01:00
BENKE Charlene
477cce718b
checkbox not updated when unchecked
...
GETPOSTISSET return false in this case and the value is not updated
2020-02-28 15:29:12 +01:00
Laurent Destailleur
e07a29ecd0
Fix class not found
2020-02-27 22:02:45 +01:00
Laurent Destailleur
2d841d9d83
Debug multilang website
2020-02-27 21:43:11 +01:00
Laurent Destailleur
a3e56994b6
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
2020-02-27 18:35:32 +01:00
Laurent Destailleur
baaa6b797b
FIX SQl syntax error
2020-02-27 17:51:31 +01:00
Laurent Destailleur
a0b465e8ae
Fix sql error
2020-02-27 17:43:59 +01:00
Laurent Destailleur
eac07aceb0
Responsive
2020-02-27 16:00:01 +01:00
Marc de Lima Lucio
6d728f12ba
NEW: invoice list: enable multicurrency columns
2020-02-27 14:10:00 +01:00
Alexandre SPANGARO
86d9622360
NEW: Accountancy - Remove pcg_subtype - Useless fonctionnality
2020-02-27 10:44:04 +01:00
atm-quentin
009eb0d4a4
FIX test on 0 better than isset
2020-02-27 09:34:20 +01:00
JC Prieto
c555a2c588
Update translate.class.php
...
Resolve bug #9105
When load() function loads translation file from an external modules, adds a \r simbol at the end of each line.
2020-02-27 09:32:22 +01:00
Laurent Destailleur
9bc5eb44ca
FIX #13182
2020-02-26 20:25:26 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ab01acfe53
Merge pull request #13211 from ATM-Marc/FIX_11.0_excess_paid_from_situation_invoice
...
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 16:30:20 +01:00
Laurent Destailleur
9c1c0ee08f
Fix for nojs interface
2020-02-26 16:17:31 +01:00
Laurent Destailleur
b52cfe58d6
FIX Disable js if no javascript
2020-02-26 15:45:12 +01:00
Laurent Destailleur
35e886fb12
FIX Disable js if no javascript
2020-02-26 15:22:23 +01:00
Marc de Lima Lucio
d3b70994fe
Merge branch 'FIX_8.0_excess_paid_from_situation_invoice' of github.com:ATM-Marc/dolibarr into FIX_11.0_excess_paid_from_situation_invoice
2020-02-26 10:42:55 +01:00
Marc de Lima Lucio
373ab3bc01
FIX: excess paid from situation invoices not counted when calculating remain to pay
2020-02-26 10:35:43 +01:00
atm-quentin
a5baf2bc88
FIX search with '0'
2020-02-26 09:19:39 +01:00
Laurent Destailleur
b7b2d3562b
Merge pull request #13195 from oscim/patch-24
...
Update commonobject.class.php
2020-02-26 05:14:27 +01:00
Laurent Destailleur
39624f21e7
Fix var not always defined
2020-02-25 15:36:34 +01:00
Laurent Destailleur
d172a95dfe
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-25 14:37:04 +01:00
Laurent Destailleur
61abfb95a5
Look and feel v12
2020-02-25 13:28:11 +01:00
Laurent Destailleur
16b3e6f7bb
Move external access on dedicated tab
...
Translate field to sort products
2020-02-25 12:44:18 +01:00
Laurent Destailleur
ace5f2844a
Make Setup of TakePOS faster with Ajax ON-Off Button.
2020-02-25 12:37:44 +01:00
Laurent Destailleur
59137f0f47
Merge pull request #13190 from oscim/patch-23
...
Update commonobject.class.php
2020-02-25 12:05:22 +01:00
Laurent Destailleur
75cddcd2de
Merge pull request #13193 from TobiasSekan/NewLinePosOdtTemplate
...
NEW Support of tag {line_pos} for line numbers for tables in ODT templates
2020-02-25 00:05:01 +01:00
Laurent Destailleur
2a6652f6b5
Merge pull request #13192 from atm-florian/11_fixcomumnRUMMissingintoImport
...
fix missing column into Bank import
2020-02-24 22:55:47 +01:00
ATM john
c216b7cae5
fix title padding definition source
2020-02-24 22:34:34 +01:00
ATM john
7b6faf7063
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 22:16:10 +01:00
ATM john
9c1fdf1c52
Fix missing php doc
2020-02-24 22:12:36 +01:00
stickler-ci
5a77716b93
Fixing style errors.
2020-02-24 21:10:14 +00:00
ATM john
3e492b8a5b
Fix title padding
2020-02-24 22:08:04 +01:00
ATM john
ae890d021c
Fix comments
2020-02-24 21:50:01 +01:00
Laurent Destailleur
d78221ea08
css
2020-02-24 21:48:46 +01:00
Laurent Destailleur
7cd49f327e
Look and feel v12: CSS for qty in lists
2020-02-24 21:47:48 +01:00
ATM john
7f2dd19bb0
Fix pdf cell padding for model cyan, erathosthene, espadon, cornas
2020-02-24 21:43:33 +01:00
Laurent Destailleur
68526a14cd
NEW Truncate columns names when too long and show full title as popup
2020-02-24 21:33:28 +01:00
Laurent Destailleur
32d74adf20
NEW Truncate columns names when too long and show full title as popup
2020-02-24 21:18:49 +01:00
stickler-ci
6de74e774e
Fixing style errors.
2020-02-24 19:50:07 +00:00
ATM john
3c4e7f7b07
Fix cell padding sponge
2020-02-24 20:47:19 +01:00
Laurent Destailleur
9d9429f66b
New: Can limit number of tabs by page.
2020-02-24 20:41:29 +01:00
oscim
65f3e5466e
Update commonobject.class.php
...
add path class for support type project or projet in element_element
2020-02-24 17:51:11 +01:00
John Botella
11b6cae4f1
Merge branch '12.0_new_allow_extrafields_on_pdf_extend_to_line_desc' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 17:48:42 +01:00
John Botella
1ca1f0677b
fix PDF cell padding
2020-02-24 17:48:01 +01:00
stickler-ci
d07e2ab8fb
Fixing style errors.
2020-02-24 16:44:46 +00:00
oscim
fe4bd46c43
Update commonobject.class.php
...
add support of contact linkedobject
2020-02-24 17:28:25 +01:00
florian HENRY
9f8166ed37
fix missing column into import
2020-02-24 15:14:01 +01:00
florian HENRY
b2b2291117
fix missing column into import
2020-02-24 15:12:26 +01:00
florian HENRY
2c26ddb22b
fix missing column into import
2020-02-24 15:11:14 +01:00
Tobias Sekan
2d9300cedb
Add position to ODT supplier_proposal template
2020-02-24 15:06:21 +01:00
Tobias Sekan
fc76586e2f
Add position to ODT supplier order template
2020-02-24 15:05:04 +01:00
Tobias Sekan
1f2203f0d6
Add position to ODT propale template
2020-02-24 15:04:02 +01:00
Tobias Sekan
933b46790a
Add position to ODT mo template
2020-02-24 15:02:11 +01:00
Tobias Sekan
7469aa1f35
Add position to ODT invoice template
2020-02-24 15:00:37 +01:00
Tobias Sekan
cdbe6c1e81
Add position to ODT contract template
2020-02-24 14:59:20 +01:00
Tobias Sekan
b29d8e53ed
Add position to ODT order template
2020-02-24 14:58:01 +01:00
Tobias Sekan
4a5593e213
Add position to ODT for bom
2020-02-24 14:56:26 +01:00
Tobias Sekan
7baba2ba43
Add line number substitution
2020-02-24 14:55:02 +01:00
John Botella
06b2d459c0
Fix cell padding
2020-02-24 14:18:49 +01:00
oscim
6c7a534018
Update commonobject.class.php
...
Add support of project/projet in objectlinked
2020-02-24 11:49:12 +01:00
Laurent Destailleur
58ebad4b15
Fix trans
2020-02-24 07:20:36 +01:00
Laurent Destailleur
8ebc157316
Test color magenta for titles
2020-02-24 06:55:08 +01:00
Laurent Destailleur
32d12468cf
Use SVG logo instead of png
2020-02-24 06:27:03 +01:00
Laurent Destailleur
3682d9143e
Fix showing bank account on PDF
2020-02-24 04:55:44 +01:00
Laurent Destailleur
150d4d33f6
Fix showing bank account on PDF
2020-02-24 04:55:09 +01:00
Laurent Destailleur
6366881f91
FIX #13175
2020-02-24 00:41:25 +01:00
ATM john
13790422dc
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-24 00:18:37 +01:00
ATM john
377b9a6b88
Add extrafields on PDF object lines desc for compatible pdf
2020-02-24 00:14:43 +01:00
ATM john
41c18a7884
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-24 00:01:50 +01:00
Laurent Destailleur
096a568e83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2020-02-23 23:42:23 +01:00
stickler-ci
fab34d5114
Fixing style errors.
2020-02-23 22:40:41 +00:00
Laurent Destailleur
3075e40f8c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/boxes/box_contacts.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/security.lib.php
2020-02-23 23:37:46 +01:00
ATM john
0c2d08cdd9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_allow_extrafields_on_pdf_extend_to_line_desc
2020-02-23 23:36:43 +01:00
Laurent Destailleur
5919570b34
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-23 23:31:51 +01:00
Laurent Destailleur
11ff3f6562
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-23 23:31:03 +01:00
Laurent Destailleur
ee45c3efb6
FIX #13184
2020-02-23 23:29:13 +01:00
ATM john
acacbfd85e
Fix list separator on first loop
2020-02-23 23:17:10 +01:00
ATM john
316fa4068a
revert commit fdfc45bbe9 and fix y position
2020-02-23 23:14:01 +01:00
ATM john
5ecef88b35
allow in extrafield conf to choose to add extrafield in a new col or append it to description, it could be useful for html or long text extrafields
2020-02-23 23:04:24 +01:00
Laurent Destailleur
ca39c680c7
Rename field documentpdf into printable (this field already exists due
...
to a very old PR nofinished for same goal).
2020-02-23 23:03:17 +01:00
Laurent Destailleur
90565e4637
Merge pull request #13179 from atm-john/12.0_new_allow_extrafields_on_pdf
...
NEW allow display extrafields on pdf
2020-02-23 22:55:16 +01:00
Laurent Destailleur
cac61c223d
Merge pull request #13176 from andreubisquerra/master
...
Add orders to Receipt Printer module
2020-02-23 22:44:14 +01:00
Laurent Destailleur
189c0d675b
Fix memory report. Xdebug no more required. Try = null instead of unset.
2020-02-23 22:05:59 +01:00
Laurent Destailleur
76e33058a8
NEW Can select several fields to personalize list before submit.
2020-02-23 21:38:24 +01:00
ATM john
93c9f07cb9
Fix note x position
2020-02-23 20:59:04 +01:00
ATM john
f611e4fc0e
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 20:53:50 +01:00
ATM john
07bd6e1fc0
Fix On admin page add extrafields form, display on pdf option doesn't saved
2020-02-23 20:52:44 +01:00
stickler-ci
222a000d31
Fixing style errors.
2020-02-23 14:27:22 +00:00
ATM john
8a279ed124
improve extrafields display in notes
2020-02-23 15:24:59 +01:00
ATM john
679e2fd186
Merge branch '12.0_new_allow_extrafields_on_pdf' of github.com:atm-john/dolibarr into 12.0_new_allow_extrafields_on_pdf
2020-02-23 11:36:06 +01:00
ATM john
fe4e00b139
Add new params to extrafields forms to allow extrafields to be displayed on pdf documents
2020-02-23 11:32:38 +01:00
stickler-ci
d575188d80
Fixing style errors.
2020-02-23 09:11:58 +00:00
ATM john
ff6dc735ee
fix extrafield conf cache
2020-02-23 10:09:47 +01:00
stickler-ci
281e059487
Fixing style errors.
2020-02-23 01:28:30 +00:00
ATM john
8c36dd0ad8
add extrafields in notes
2020-02-23 02:26:21 +01:00
ATM john
60b3d9d4db
Add extrafields on PDF object lines for compatible pdf
2020-02-22 18:07:15 +01:00
stickler-ci
2b027cfebf
Fixing style errors.
2020-02-22 15:45:39 +00:00
ATM john
e209fd2973
Add extrafields on PDF object lines
2020-02-22 16:27:44 +01:00
ATM john
aa77d96f23
remove IDE warnings
2020-02-22 12:06:21 +01:00
javierybar
fddcc844ff
Add orders to Receipt Printers module
2020-02-22 11:30:48 +01:00
ATM john
4117aa56a2
Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty
2020-02-22 11:19:49 +01:00
Laurent Destailleur
b4fdd9bc50
Merge pull request #13078 from hregis/10.0_mc
...
FIX #10309
2020-02-21 19:21:54 +01:00
Laurent Destailleur
e4b00c5c20
Merge branch 'develop' into master
2020-02-21 18:20:10 +01:00
Frédéric FRANCE
f6eba36575
fix CATEGORY_ADD_DESC_INTO_DOC
...
$cate->add_category doesn't exists
2020-02-21 18:00:12 +01:00
Laurent Destailleur
9b9f6d5da4
Merge pull request #13151 from frederic34/patch-6
...
fix CATEGORY_ADD_DESC_INTO_DOC
2020-02-21 17:55:19 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4
Fix remove a lot of warnings on Eclipse
2020-02-21 17:47:36 +01:00
Laurent Destailleur
ec09e7222d
Fix remove a lot of warnings on Eclipse
2020-02-21 17:31:37 +01:00
Laurent Destailleur
7e4af04886
CSS For bookmark dropdown
2020-02-21 17:18:01 +01:00
Laurent Destailleur
be3ecb3093
Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless
2020-02-21 14:32:53 +01:00
Laurent Destailleur
7909055ee8
Enhance multilangue support in website module
2020-02-21 11:36:16 +01:00
Laurent Destailleur
1f4b639ba0
Debug MRP module
2020-02-20 17:44:03 +01:00
andreubisquerra
e316061a9a
Fix travis
2020-02-20 16:26:30 +01:00
andreubisquerra
7a241ba042
Fix travis
2020-02-20 15:47:40 +01:00
Laurent Destailleur
c29e1e78f3
NEW Bookmarks are now in top menu bar
2020-02-20 15:43:31 +01:00
Laurent Destailleur
593091f399
FIX etrafield with visibilty=5 were not in read only
...
FIX CSS
FIX option for topbar search and bookmarks
Conflicts:
htdocs/theme/eldy/global.inc.php
2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9
FIX etrafield with visibilty=5 were not in read only
...
FIX CSS
FIX option for topbar search and bookmarks
2020-02-20 15:25:32 +01:00
javierybar
2942e85e47
More elegant and easy to understand printer setup
2020-02-20 15:16:17 +01:00
Ferran Marcet
9ff424e23b
FIX: Visualization rights correction on last modified contacts box
2020-02-20 11:45:46 +01:00
Frédéric FRANCE
523e161f33
fix CATEGORY_ADD_DESC_INTO_DOC
...
$cate->add_category doesn't exists
2020-02-20 09:45:17 +01:00
Alexandre SPANGARO
a7ca7dfbb6
FIX: z-index for moretabsList with constant MAIN_MAXTABS_IN_CARD
2020-02-20 06:00:17 +01:00
Laurent Destailleur
ac5e9ce5b3
Fix doc
2020-02-20 01:34:33 +01:00
Laurent Destailleur
76f0df138b
Try to fix doc
2020-02-20 01:26:40 +01:00
Laurent Destailleur
5c48f6f405
Lang of web site is optional
2020-02-20 01:08:53 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
2cfca2a45e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/comm/index.php
htdocs/core/boxes/box_fournisseurs.php
htdocs/core/boxes/box_propales.php
htdocs/societe/index.php
2020-02-20 00:18:58 +01:00
Laurent Destailleur
91899d2f56
Fix list of opportunity with filter on search_usage_opportunity
2020-02-19 14:32:12 +01:00
Laurent Destailleur
ace0c7f89d
Fix list of opportunity with filter on search_usage_opportunity
2020-02-19 14:31:32 +01:00
Laurent Destailleur
0c571c0376
Restore common behaviour: Draft object are on left under graph.
...
Open and live objects are on right
2020-02-19 14:20:55 +01:00
Laurent Destailleur
f109864670
NEW Add a profil to import contact categories
...
Load roles of contact only when required
2020-02-19 13:22:24 +01:00
John Botella
729048a113
Fix langs
2020-02-19 12:33:36 +01:00
John Botella
d65c17df7d
Add retained warranty for all invoice for crabe PDF
2020-02-19 12:30:52 +01:00
Laurent Destailleur
1dd5ba093d
Prepare PHP v8 - mktime() and gmmktime() are no more allowed
2020-02-19 12:11:16 +01:00
John Botella
6acf10c0d4
extend retained warranty to be available for all invoices
2020-02-19 11:54:55 +01:00
Laurent Destailleur
ac16857501
GETPOST(..., 'alpha') remove " if found instead of returning ''
2020-02-19 11:33:45 +01:00
Laurent Destailleur
7c07589850
FIX #13124
2020-02-19 03:07:12 +01:00
Laurent Destailleur
016c7ad875
FIX #13135
2020-02-19 01:17:16 +01:00
Laurent Destailleur
9883c0b688
Merge pull request #12677 from OPEN-DSI/new-project-weighted-amount
...
NEW add weighted amount on project/opportunity
2020-02-19 00:03:03 +01:00
Laurent Destailleur
ce3e977fc3
Merge pull request #13141 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-02-18 23:49:10 +01:00
Laurent Destailleur
88b104bc2f
Merge pull request #13121 from aspangaro/12.0_a14
...
NEW: Donation - Update FR CERFA to 11580*04
2020-02-18 23:48:08 +01:00
Scrutinizer Auto-Fixer
fd48877dc6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
dacf896f80
FIX Can read salary if permission + user under hierarchy
2020-02-18 23:44:36 +01:00
Laurent Destailleur
ce09ec8805
Fix phpcs
2020-02-18 23:35:45 +01:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
24bb61b5e4
FIX Usage of project not available in export.
2020-02-18 12:51:53 +01:00
Laurent Destailleur
b6be42e103
FIX List of viewed projects too large in task widget
2020-02-18 12:40:50 +01:00
Laurent Destailleur
67eb584a7f
FIX Missing field "billed" in export
2020-02-18 12:22:25 +01:00
Laurent Destailleur
7e814e2a08
FIX Menu truncated. Add tooltip to have all content.
2020-02-18 12:01:19 +01:00
Laurent Destailleur
b618581692
More ajax button in setup. Can reload after on ajaxonoff.
2020-02-18 09:38:34 +01:00
Laurent Destailleur
6555f5d74f
More default hmtl tags in restricthtmlonly
2020-02-17 20:55:17 +01:00
Pierre Ardoin
f8e18a3826
Fix Not displayed email
2020-02-17 19:25:25 +01:00
Pierre Ardoin
a773b86ad1
Fix not displayed value
2020-02-17 19:23:48 +01:00
Pierre Ardoin
29cfd6d857
Fix issue with Multicompany
...
Before : can't find photo
Now : ok
2020-02-17 19:18:22 +01:00
Pierre Ardoin
f1bbe1c64d
Fix issue not show photo.
2020-02-17 19:09:58 +01:00
Laurent Destailleur
299219891e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-17 12:41:45 +01:00
Laurent Destailleur
25fa83bd06
Fix phpcs
2020-02-17 12:40:26 +01:00
Laurent Destailleur
a6b0fec90b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee
FIX duplicate class name into some log lines
2020-02-17 12:34:00 +01:00
Laurent Destailleur
1904ae0e82
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-02-17 12:25:51 +01:00
Laurent Destailleur
549bf076d7
Fix prefix of log
2020-02-17 12:22:52 +01:00
Laurent Destailleur
a02f5cde92
FIX Type of contact for event does not exists and not supported
...
FIX Type of contact not saved when creating a contact
FIX SQL Overload in default contact trigger.
FIX Trigger name PROPAL_SUPPLIER_TRIGGER into PROPOSAL_SUPPLIER_TRIGGER
2020-02-17 12:21:07 +01:00
Laurent Destailleur
bf281b7dab
Comment
2020-02-17 11:51:49 +01:00
Alexandre SPANGARO
aa9d00c62e
FIX
2020-02-17 07:47:08 +01:00
Alexandre SPANGARO
76a369d351
NEW: Donation - Update FR CERFA to 11580*04
2020-02-17 07:43:24 +01:00
Laurent Destailleur
4b5cda5cd2
Code comment on OAUth ahtent
2020-02-16 21:16:00 +01:00
Laurent Destailleur
20797920d7
Fix phpcs
2020-02-16 19:35:52 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-16 18:16:05 +01:00
Laurent Destailleur
ac7a077c77
FIX Vulnerability in module from modulebuilder. Only fields with type
...
html can contains HTML.
2020-02-16 18:14:10 +01:00
Laurent Destailleur
dc3a15945d
Add method getKanbanView()
2020-02-16 12:05:00 +01:00
Laurent Destailleur
6c9fb06292
Perf
2020-02-15 10:56:44 +01:00
Regis Houssin
0ab0bb2e7d
FIX wrong test
2020-02-14 19:26:28 +01:00
Laurent Destailleur
fc018d0063
Module MO is now stable
2020-02-13 17:24:29 +01:00
Scrutinizer Auto-Fixer
011803ac71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 11:36:05 +00:00
Laurent Destailleur
46bccf88d3
Fix var not initialized
2020-02-13 12:33:34 +01:00
Laurent Destailleur
9e165a782f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-13 11:58:23 +01:00
Laurent Destailleur
78d4978d31
FIX #13100
2020-02-13 11:26:11 +01:00
Scrutinizer Auto-Fixer
17010478ba
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-13 09:44:08 +00:00
Regis Houssin
52506ddd05
FIX can be a string or integer
2020-02-13 09:25:36 +01:00
Regis Houssin
f19f706c38
FIX better check
2020-02-13 07:55:52 +01:00
Laurent Destailleur
4762bafb02
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/mrp/class/mo.class.php
2020-02-12 22:58:37 +01:00
Laurent Destailleur
2ce0aa87e6
Responsive
2020-02-12 22:10:26 +01:00
Laurent Destailleur
bf2051ff80
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 22:03:01 +01:00
Laurent Destailleur
4981da235c
Fix phpcs
2020-02-12 22:00:44 +01:00
Laurent Destailleur
e69b362fb5
Merge pull request #13079 from RubenRuCh/11.0
...
FIX : #13038 ExpenseReport PDF - custom category description is not correct
2020-02-12 21:59:23 +01:00
stickler-ci
f8eaca24af
Fixing style errors.
2020-02-12 20:54:56 +00:00
Laurent Destailleur
c31fcb3981
Merge branch 'develop' into patch-30
2020-02-12 21:53:02 +01:00
Laurent Destailleur
75774ec6c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-12 20:30:30 +01:00
Laurent Destailleur
7931734ecb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modUser.class.php
2020-02-12 20:30:20 +01:00
Laurent Destailleur
4a5467234d
Merge pull request #13074 from simicar29/simicar29-patch-4
...
Show extrafields only when enabled
2020-02-12 18:47:32 +01:00
Laurent Destailleur
4678c7ef7a
Merge pull request #13081 from bb2a/patch-14
...
Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value
2020-02-12 18:46:08 +01:00
Laurent Destailleur
3a9125b097
Merge pull request #13087 from ptibogxiv/patch-304
...
Fix netmeasure update and display
2020-02-12 18:35:44 +01:00
Laurent Destailleur
bd0666bf53
Update product.lib.php
2020-02-12 18:35:15 +01:00
Laurent Destailleur
e74df397eb
FIX #13094
2020-02-12 17:28:18 +01:00
ptibogxiv
f17c7f4cb3
fix for unit with rowid (netmeasure)
2020-02-11 20:21:53 +01:00
Laurent Destailleur
cc6313cdf3
Fix import examples
2020-02-11 19:32:27 +01:00
Laurent Destailleur
2afe86a1d6
Fix look and feel v11
2020-02-11 19:19:13 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
8518e0752f
NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page
2020-02-11 16:01:32 +01:00
Laurent Destailleur
05f0242198
NEW The info_admin() can show text after click on other text
2020-02-11 10:38:09 +01:00
Anthony Berton
6b6355f373
Update html.form.class.php
2020-02-11 09:57:52 +01:00
Ruger
8d9de521f3
FIX : #13038 ExpenseReport PDF - custom category description is not correct
2020-02-11 09:13:15 +01:00
Regis Houssin
275b5d1f77
FIX #10309
2020-02-11 07:32:29 +01:00
Laurent Destailleur
5823e2f5ef
add warning
2020-02-10 20:57:55 +01:00
Pierre Ardoin
fab8536f05
add project ref and title
2020-02-10 17:02:10 +01:00
Pierre Ardoin
f9b03596f6
Add project ref and title
2020-02-10 17:01:21 +01:00
Pierre Ardoin
573d86c725
Add project's ref and Title
2020-02-10 16:57:59 +01:00
Pierre Ardoin
546e7b1bcf
Add project Ref and Title
2020-02-10 16:57:02 +01:00
Pierre Ardoin
f279b4138b
Add Project Ref and Title
2020-02-10 16:52:41 +01:00
Laurent Destailleur
82f5482e25
Merge pull request #13071 from aspangaro/12.0_a13
...
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 15:40:09 +01:00
Laurent Destailleur
4973f49113
Merge pull request #13070 from aspangaro/12.0_a12
...
NEW: Add accountancy code of thirdparty in contact export
2020-02-10 15:38:45 +01:00
Laurent Destailleur
8604ff99ed
Merge pull request #13068 from andreubisquerra/develop
...
Add time tags to Receipt Printers module
2020-02-10 15:37:37 +01:00
simicar29
8bce409db0
Show extrafields only when enabled
...
Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
2020-02-10 13:14:42 +01:00
Pierre Ardoin
6de3795648
change translation Ref
...
ProjectRef -> RefProject
2020-02-10 09:10:45 +01:00
Pierre Ardoin
d74e1d9182
Update pdf_crabe.modules.php
2020-02-10 09:07:26 +01:00
stickler-ci
5022e58b95
Fixing style errors.
2020-02-10 08:04:40 +00:00
Pierre Ardoin
bd00803090
Update pdf_crabe.modules.php
2020-02-10 09:03:00 +01:00
stickler-ci
6ffbab0a63
Fixing style errors.
2020-02-10 08:01:40 +00:00
Pierre Ardoin
815206cb15
Add Project Title in header of pdf
...
Add project Title if Global Constant PDF_SHOW_PROJECT_TITLE is active.
2020-02-10 08:59:22 +01:00
Alexandre SPANGARO
20f9154cf3
NEW: Add accountancy code of thirdparty in supplier export
2020-02-10 06:24:13 +01:00
Alexandre SPANGARO
d28f110100
NEW: Add accountancy code of thirdparty in contact export
2020-02-10 06:06:27 +01:00
Laurent Destailleur
ecb1f1f2d7
Responsive
2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb
Responsive
2020-02-10 00:47:44 +01:00
Laurent Destailleur
d49943ab37
FIX #13019
2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc
FIX #13022
2020-02-09 18:34:53 +01:00
Laurent Destailleur
8645fd8946
FIX CVE-2019–17223 FIX #13053
2020-02-09 18:28:57 +01:00
Laurent Destailleur
6badf724cf
FIX Mail smtps truncated if content has a line with single .
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-09 16:38:19 +01:00
Laurent Destailleur
5c000159c1
FIX Mail smtps truncated if content has a line with single .
2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f
FIX Mail smtps truncated if content has a line with single .
2020-02-09 15:51:43 +01:00
andreubisquerra
37e815183e
Add time tags
2020-02-09 14:06:02 +01:00
Laurent Destailleur
1ee959a11f
Generic graph
2020-02-08 17:46:41 +01:00
Laurent Destailleur
33addfab01
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 17:21:17 +01:00
Laurent Destailleur
3852ba0655
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 17:16:25 +01:00
Laurent Destailleur
81df5cd9ab
Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering
...
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
2020-02-08 17:16:01 +01:00
Laurent Destailleur
aed3ea25cb
Code comment
2020-02-08 17:14:04 +01:00
Laurent Destailleur
3dfe7161cf
Merge pull request #13035 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2020-02-08 17:09:25 +01:00
Laurent Destailleur
665876ffa4
Merge pull request #13061 from andreubisquerra/develop
...
Add and finish receipt printer tags
2020-02-08 16:19:44 +01:00
pnueda
c083458adf
Update html.formfile.class.php
...
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1
Merge pull request #13060 from pnueda/patch-1
...
Update html.formfile.class.php
2020-02-08 16:18:17 +01:00
Laurent Destailleur
ee29c3efdd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-08 16:02:23 +01:00
Laurent Destailleur
716f765ce1
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
2020-02-08 16:00:06 +01:00
Laurent Destailleur
c27260869b
FIX #13046 More complete
2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/tools/export_files.php
htdocs/comm/mailing/class/advtargetemailing.class.php
htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
Laurent Destailleur
b01e1e7724
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160
Fix #13046 - Bad parenthesis on test
2020-02-08 15:28:40 +01:00
Laurent Destailleur
5fac824824
Merge pull request #13040 from atm-arnaud/FIX_adv_target_emailing
...
FIX advanced target emailing sql and ergonomy
2020-02-08 14:59:00 +01:00
ptibogxiv
8100708639
Update pdf_espadon.modules.php
2020-02-08 14:57:04 +01:00
ptibogxiv
ae5da164c6
FIX need weight short label in shipping doc
...
need short label because value + term is too long
2020-02-08 14:56:36 +01:00
Laurent Destailleur
b66c2a29a2
Merge branch 'develop' into patch-301
2020-02-08 14:54:23 +01:00
Laurent Destailleur
9c12c4be08
Fix customreports
2020-02-08 14:49:26 +01:00
Laurent Destailleur
3a74c3d7e9
Enhance property ->ismulticompanymanaged to define an object with entity
...
on its parent.
2020-02-08 14:40:30 +01:00
Laurent Destailleur
c3beb854a2
Definition of $fields for member and subscriptions
2020-02-08 13:44:31 +01:00
Laurent Destailleur
cffc56b80b
Declaration of property fields of thirdparties
2020-02-08 11:32:38 +01:00
andreubisquerra
1e5940fbf0
Fix travis errors
2020-02-07 19:25:28 +01:00
andreubisquerra
ae06151146
Add and finish receipt printer tags
2020-02-07 18:34:58 +01:00
pnueda
8eb9c10788
Update html.formfile.class.php
...
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-07 18:01:14 +01:00
Laurent Destailleur
fe7b79c83c
Fix definition of objects
2020-02-07 15:51:14 +01:00
Laurent Destailleur
4e4fd4c76c
Remove code using a no more used field
2020-02-07 13:15:51 +01:00
Laurent Destailleur
0f1a8a3997
Implement min and max for generic graph
2020-02-07 13:01:07 +01:00
Laurent Destailleur
d9fda71a23
Fix phpcs
2020-02-07 12:51:08 +01:00
Laurent Destailleur
cd58822d98
Can edit a table of resolution code for tickets
2020-02-07 12:48:41 +01:00
Laurent Destailleur
84c1228ad4
FIX Disable ticket status change if ticket close
...
FIX Use ref into label of ticket message
2020-02-07 12:15:15 +01:00
Laurent Destailleur
54414f7bb0
WIP Generic report
2020-02-07 11:53:09 +01:00
Laurent Destailleur
53e1b80742
FIX Disable ticket status change if ticket close
...
FIX Use ref into label of ticket message
2020-02-07 11:52:55 +01:00
Laurent Destailleur
ff4ce2e505
WIP Work on generic custom graph
2020-02-07 10:58:17 +01:00
VESSILLER
0be98a4b1b
NEW add opportunity status in project stats
2020-02-07 09:06:07 +01:00
Laurent Destailleur
fe0d1a81eb
Fix filter on current user is stupi on the view "per user".
2020-02-06 21:16:48 +01:00
Laurent Destailleur
5e71366ff2
css
2020-02-06 18:06:36 +01:00
Laurent Destailleur
c8f7b79c48
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-06 13:05:52 +01:00
Laurent Destailleur
387db16217
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-06 13:03:10 +01:00
Laurent Destailleur
e14612f569
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
Conflicts:
htdocs/core/class/CMailFile.class.php
2020-02-06 13:02:27 +01:00
Laurent Destailleur
13442ef0df
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
2020-02-06 13:01:09 +01:00
Laurent Destailleur
05e08b3596
FIX Filenames must not contains non ascii char or we will get non ascii
...
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
2020-02-06 12:58:02 +01:00
atm-arnaud
bd6d49f04a
FIX advanced target emailing sql and ergonomy
2020-02-06 12:08:50 +01:00
Scrutinizer Auto-Fixer
59c0631172
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-06 09:49:12 +00:00
ptibogxiv
2ca6b8f633
Update pdf_espadon.modules.php
2020-02-06 10:49:05 +01:00
ptibogxiv
f1cce26ef0
FIX need weight short label in shipping doc
...
need short label because value + term is too long
2020-02-06 10:47:56 +01:00
Laurent Destailleur
48e6db17bd
Fix doc
2020-02-06 10:28:49 +01:00
Laurent Destailleur
2966b2303b
Fix phpcs
2020-02-06 10:23:04 +01:00
Laurent Destailleur
48cd8e1314
Fix doc
2020-02-06 10:17:06 +01:00
Laurent Destailleur
857c22cb29
Fix doc
2020-02-06 10:13:10 +01:00
Laurent Destailleur
dbb731a656
Merge pull request #12957 from TobiasSekan/AddTempWorkFolder
...
NEW Hidden option MAIN_TEMP_DIR
2020-02-05 20:43:26 +01:00
Laurent Destailleur
4a07740601
Update conf.class.php
2020-02-05 20:42:44 +01:00
Laurent Destailleur
7cc959e316
Update conf.class.php
2020-02-05 20:42:03 +01:00
stickler-ci
1ecef695f8
Fixing style errors.
2020-02-05 19:40:22 +00:00
Laurent Destailleur
3e73e97f24
Update conf.class.php
2020-02-05 20:39:38 +01:00
Laurent Destailleur
98ac0428a5
Update conf.class.php
2020-02-05 20:37:49 +01:00
Laurent Destailleur
4f3cc87077
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:38 +01:00
Laurent Destailleur
30fa8940a9
FIX Confusion between 'bank reconciled' and 'accounted'. Show both data
2020-02-05 19:23:00 +01:00
Laurent Destailleur
80f4e625be
Fix phpcs
2020-02-05 17:07:42 +01:00
Laurent Destailleur
fdfc45bbe9
Fix wrapping
2020-02-05 15:04:11 +01:00
Florian Mortgat
eb17a52027
FIX 11.0 - default filtering for extrafields of type 'select' should not use a LIKE "%value%" condition because keys might overlap
2020-02-05 14:57:40 +01:00
Laurent Destailleur
a2bb64354b
Fix bad merge
2020-02-05 14:56:01 +01:00
Laurent Destailleur
1875b6a49b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/security2.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
1fe9783760
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/product/index.php
2020-02-05 14:38:19 +01:00
Laurent Destailleur
9515467300
Merge pull request #13005 from RubenRuCh/11.0
...
FIX : #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
2020-02-05 14:30:40 +01:00
Laurent Destailleur
c015707cbc
Fix Only dolibarr logos are in root of theme
2020-02-05 14:14:59 +01:00
andreubisquerra
220f02805d
Update image path after move image directory
...
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
2020-02-05 14:12:29 +01:00
Laurent Destailleur
320dd69923
Merge pull request #13002 from andreubisquerra/develop
...
Update image path after move image directory
2020-02-05 14:10:12 +01:00
Laurent Destailleur
ddd1ca26b9
CSS
2020-02-05 14:04:19 +01:00
Laurent Destailleur
f8daed7f56
Update company.lib.php
2020-02-05 12:49:56 +01:00
Laurent Destailleur
8051e916c0
Merge pull request #13017 from andreubisquerra/develop
...
Add bold tags to Receipt Printers module
2020-02-05 12:40:07 +01:00
Laurent Destailleur
63ba601906
Update box_project.php
2020-02-05 12:39:00 +01:00
ptibogxiv
94fd2b40c7
new fix Count of Stripe payment mode must take test/live into account
...
fix error message for if no stripe enabled 0b891d5e0c
2020-02-05 12:04:27 +01:00
Pierre Ardoin
81ed70ffc7
Update box_project.php
2020-02-05 09:18:39 +01:00
Pierre Ardoin
d5b74a8ca3
Update box_project.php
2020-02-05 09:06:43 +01:00
Pierre Ardoin
262d889700
Update box_project.php
2020-02-05 08:50:51 +01:00
Laurent Destailleur
0b891d5e0c
FIX Count of Stripe payment mode must take test/live into account
2020-02-04 19:33:47 +01:00
Laurent Destailleur
bc19f72306
FIX Count of Stripe payment mode must take test/live into account
2020-02-04 19:33:20 +01:00
Laurent Destailleur
bb1c9a66dd
Fix code alignement on modulebuilder
2020-02-04 16:37:30 +01:00
Laurent Destailleur
976ce0a954
Fix scrutinizer
2020-02-04 14:33:25 +01:00
Laurent Destailleur
157745a1bb
Fix phpcs
2020-02-04 14:18:37 +01:00
AdrianDominik
4695172028
Merge remote-tracking branch 'upstream/11.0' into 11.0
2020-02-04 11:40:37 +01:00
Pierre Ardoin
d93a597a1e
Fix Compatbility with Multicompany
...
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
2020-02-04 09:17:02 +01:00
Laurent Destailleur
bf4fca0c7e
Fix warning
2020-02-03 22:09:21 +01:00
Laurent Destailleur
c367c6f34e
Avoid warning
2020-02-03 21:17:45 +01:00
andreubisquerra
e6dc384ee9
Add bold tags
2020-02-03 19:33:23 +01:00
stickler-ci
5dcd5e5b87
Fixing style errors.
2020-02-03 09:54:35 +01:00
AdrianDominik
ed269a387f
FIX : #11975 When a product is split between multiple pages in a document, prices/quantity/etc appear on the last relevant page
2020-02-03 09:54:34 +01:00
Laurent Destailleur
97d726733c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/includes/tecnickcom/tcpdf/tcpdf.php
2020-02-03 06:36:43 +01:00
Laurent Destailleur
d8ed62ea33
Fix line_max for BOM
2020-02-03 06:28:51 +01:00
Laurent Destailleur
e5808e3335
FIX #12995
2020-02-03 04:48:17 +01:00
Laurent Destailleur
7c35e9aaa8
FIX #12932
2020-02-03 03:56:30 +01:00
Laurent Destailleur
1dab308e4a
FIX #12932
2020-02-03 03:55:37 +01:00
Laurent Destailleur
37617bbce8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 03:48:27 +01:00
Laurent Destailleur
5633f58477
FIX #12978
2020-02-03 03:25:41 +01:00
Laurent Destailleur
ccf8e81f93
FIX #12975
2020-02-03 03:10:10 +01:00
Laurent Destailleur
ff6bcbdcf8
Fix trans
2020-02-03 03:10:03 +01:00
Laurent Destailleur
240727c3e1
FIX #12975
2020-02-03 03:08:54 +01:00
Laurent Destailleur
3f73339818
Fix trans
2020-02-03 03:01:23 +01:00
Laurent Destailleur
fc47fa5ec3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/element.php
2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-03 02:52:46 +01:00
andreubisquerra
a4c1c00728
Update image path after move image directory
...
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
2020-02-02 21:02:43 +01:00
Laurent Destailleur
12b63606df
Fix look and feel of v11
2020-02-02 20:21:16 +01:00
Laurent Destailleur
21e4717721
Merge pull request #12983 from atm-quentin/NEW_monthly_view
...
NEW monthly view to enter time
2020-02-02 20:05:18 +01:00
Laurent Destailleur
86c1777702
Merge pull request #12976 from mapiolca/patch-28
...
Add support of Number2Words module (v2)
2020-02-02 19:54:49 +01:00
Laurent Destailleur
7cb2c21dc2
FIX #12974
2020-02-02 19:50:53 +01:00
Laurent Destailleur
ffa847bc8e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744
FIX Log of authentication ko or ko + CVE-2020-7996
2020-02-02 19:05:38 +01:00
Laurent Destailleur
4765198af2
Clean code from using deprecated field amount
2020-02-02 19:03:37 +01:00
Laurent Destailleur
aa54aaeb01
FIX search filter on extrafields were not restored avec "Back to list"
2020-01-31 19:46:03 +01:00
Laurent Destailleur
2dd1e34c2d
Fix phpcs
2020-01-31 19:01:31 +01:00
Laurent Destailleur
ad6758c4da
Fix bad var
2020-01-31 18:03:45 +01:00
Laurent Destailleur
9372940f17
Fix log through proxy
2020-01-31 17:51:30 +01:00
Laurent Destailleur
b81d223ab3
Do no retry ping after error the same month
2020-01-31 17:27:48 +01:00
Laurent Destailleur
8e18a08377
Fix log of proxy forward only if it differs from remote_addr
2020-01-31 16:59:10 +01:00
Laurent Destailleur
0cd8337b7e
NEW Can manage situation invoices
2020-01-31 14:54:42 +01:00
Laurent Destailleur
f752551914
WIP Generic stats page
2020-01-31 14:53:47 +01:00
atm-quentin
78baae1480
Fix stickler v2
2020-01-31 11:51:40 +01:00
atm-quentin
398e83d1cc
FIX for stickler
2020-01-31 11:36:53 +01:00
stickler-ci
fee113bfb5
Fixing style errors.
2020-01-31 10:26:33 +00:00
atm-quentin
a001913751
Debut modification saisie par mois
...
NEW hook and data id
NEW visu FROM day TO day in permonth view
FIX
2020-01-31 11:21:49 +01:00
atm-quentin
ae14814f10
NEW visu FROM day TO day in permonth view
2020-01-31 11:10:40 +01:00
Laurent Destailleur
1c24bcc724
FIX CVE Need permission to be able to develop modules
2020-01-31 10:29:41 +01:00
Laurent Destailleur
51c6540a56
WIP Advanced search
2020-01-30 23:28:50 +01:00
Laurent Destailleur
c0bf89929f
Code comment
2020-01-30 19:14:59 +01:00
Laurent Destailleur
b47e1bd8e8
Fix protection when creating extrafield of type separator
2020-01-30 18:47:41 +01:00
Laurent Destailleur
7b92aaa115
Fix templateResult into templateSelection
2020-01-30 18:45:50 +01:00
Laurent Destailleur
c58f76b15c
Fix constant name
2020-01-30 17:06:26 +01:00
Pierre Ardoin
05d3c134db
Add support of Number2Words module (v2)
...
if the Number2Words Module is detected, this conversion is selected.
2020-01-30 15:58:21 +01:00
Laurent Destailleur
141664ff10
Fix phpcs
2020-01-30 02:25:26 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
4b0ca24ca3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:51 +01:00
Laurent Destailleur
7b10c2440b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-29 23:08:42 +01:00
Laurent Destailleur
af61c19ffd
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-29 23:06:21 +01:00
Laurent Destailleur
e13f1509b3
Merge pull request #12965 from frederic34/patch-6
...
Update extrafields.class.php
2020-01-29 22:57:01 +01:00
Laurent Destailleur
1e879126cd
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
60f772d285
FIX Pending amount to pay must be zero if invoice close for anticipated
...
payment.
2020-01-29 17:56:09 +01:00
Frédéric FRANCE
dcc8b4b65e
Update extrafields.class.php
2020-01-29 15:35:46 +01:00
Laurent Destailleur
1e13f6fd0f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/resource/class/dolresource.class.php
htdocs/resource/list.php
2020-01-29 11:44:04 +01:00
altairis
3c3876eb59
FIX : default lang selection when filter
2020-01-29 11:32:24 +01:00
Tobias Sekan
8b3eb35cd1
[NEW] Hidden option MAIN_TEMP_DIR
2020-01-29 10:55:56 +01:00
Laurent Destailleur
2fe333fe90
Merge pull request #12950 from andreubisquerra/develop
...
Default example receipt template
2020-01-28 20:41:56 +01:00
andreubisquerra
09bcb39cff
Default to Example
2020-01-28 18:59:51 +01:00
Laurent Destailleur
ff3a7a45cc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:33 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
andreubisquerra
d0b3614c57
Default receipt template
2020-01-28 15:31:03 +01:00
VESSILLER
7cdd334995
FIX require category class in extrafield
2020-01-28 11:37:23 +01:00
Tobias Sekan
713fb1a290
Fix additional space after card name
2020-01-28 08:55:49 +01:00
Laurent Destailleur
f64ad71924
Missing country code
2020-01-28 02:50:11 +01:00
Laurent Destailleur
c2c80bf40f
Fix Look and feel v11
2020-01-28 02:44:41 +01:00
Laurent Destailleur
fc63d7366d
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:23:40 +01:00
Laurent Destailleur
4fe942985f
FIX Mandatory fields must stay mandatory if create/update submit fails
2020-01-27 22:22:59 +01:00
Laurent Destailleur
a230a0aa13
Fix url to pay
2020-01-27 21:37:52 +01:00
Laurent Destailleur
29853b5fbd
Fix responsive for public interface of tickets
2020-01-27 14:01:35 +01:00
Laurent Destailleur
50d9ac0b52
Fix else if
2020-01-27 02:13:12 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
2020-01-27 01:50:02 +01:00
Laurent Destailleur
17ceeb6a6e
Merge pull request #12729 from frederic34/patch-6
...
NEW upload odt models for order
2020-01-26 23:55:04 +01:00
Laurent Destailleur
9cd2a63752
Merge pull request #12739 from frederic34/patch-7
...
NEW upload odt models for proposal
2020-01-26 23:49:31 +01:00
Laurent Destailleur
4a5dca4a3d
Fix test
2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04
Merge pull request #12818 from glafarge/patch-1
...
New : Add native spellcheck to CKEditor
2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42
Update doleditor.class.php
2020-01-26 23:31:19 +01:00
Laurent Destailleur
d13e5bc90b
FIX #12875
2020-01-26 23:22:47 +01:00
Laurent Destailleur
3215af9900
Merge pull request #12923 from simicar29/develop
...
New: Add Hook doPreMassActions
2020-01-26 22:32:46 +01:00
Laurent Destailleur
02f8faeeac
Update massactions_pre.tpl.php
2020-01-26 22:32:37 +01:00
Laurent Destailleur
627fa996a3
Merge pull request #12922 from simicar29/simicar29-patch-2
...
Update "submitted only" module options
2020-01-26 22:27:54 +01:00
Laurent Destailleur
8ff19a2a0f
WIP search component
2020-01-26 22:02:31 +01:00
Laurent Destailleur
30a5ab479f
Can choose text to show when there is no data
2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59
Fix phpcs
2020-01-25 14:40:16 +01:00
Laurent Destailleur
f2771b3365
FIX #12896
2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347
FIX #12913
2020-01-25 14:03:24 +01:00
Laurent Destailleur
09e707b818
trans
2020-01-25 13:05:40 +01:00
Laurent Destailleur
08d8670bb3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/class/product.class.php
2020-01-24 20:12:27 +01:00
Laurent Destailleur
8f3f34e1c0
Fix css
2020-01-24 20:11:07 +01:00
Laurent Destailleur
de4183ea65
Update logos
2020-01-24 17:30:46 +01:00
gauthier
4222639702
FIX : Extrafield position in export field list must respect "pos" field
2020-01-24 15:32:59 +01:00
Laurent Destailleur
779cd94b0e
Debug cashfence feature
2020-01-24 15:26:18 +01:00
stickler-ci
cfa67b6a5d
Fixing style errors.
2020-01-24 08:47:11 +00:00
simicar29
4761671fc8
Add Hook doPreMassActions
...
Add Hook doPreMassActions to allow dedicated form display for custom mass actions
2020-01-24 09:41:22 +01:00
simicar29
65cc1202ce
Update "submitted only" module options
...
Don't update to the null value options absent from the posted parameters.
2020-01-24 09:23:08 +01:00
Laurent Destailleur
540713510e
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45
Fix load of segment prices not required for virtual stock change
...
virtual stock must include production (WIP)
2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
b3bbb23dae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/smtps.class.php
2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f
FIX Error in log for email sending with smtps was not complete
2020-01-23 17:30:05 +01:00
Laurent Destailleur
7ad827f212
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
htdocs/core/lib/functions2.lib.php
2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c
Update functions2.lib.php
2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082
Update functions2.lib.php
2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559
Move function to functions2.lib.php
2020-01-23 11:47:30 +01:00
Laurent Destailleur
41577714ce
Add link to pay online into sponge template.
2020-01-23 11:25:08 +01:00
Laurent Destailleur
298b273496
Merge branch 'develop' into patch-22
2020-01-23 11:20:24 +01:00
Laurent Destailleur
fa305a1471
Update box_factures_imp.php
2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741
Fix: strict mode mysql compatibility
2020-01-23 10:47:52 +01:00
Alexandre SPANGARO
5eeef771fa
FIX: FEC export format
2020-01-23 06:20:31 +01:00
Laurent Destailleur
040f8bef5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2020-01-22 16:29:04 +01:00
Laurent Destailleur
28d0b85b84
Fix phpcs
2020-01-22 14:56:19 +01:00
Laurent Destailleur
2679f057fb
Doc
2020-01-22 14:40:43 +01:00
Laurent Destailleur
d6a31f60cd
Clean code
2020-01-22 14:39:00 +01:00
Laurent Destailleur
ee21ea5ef8
Fix phpcs
2020-01-22 14:27:38 +01:00
Laurent Destailleur
2caa4e9fa6
Merge pull request #12885 from leninrivas/10.0
...
FIX Missing Linked objects Fichinter Ref. in PDF formats
2020-01-22 14:17:25 +01:00
Laurent Destailleur
57569604b2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:53 +01:00
Laurent Destailleur
d3411a79ef
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-22 14:11:44 +01:00
Laurent Destailleur
4686be34d2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/product/class/product.class.php
htdocs/stripe/charge.php
2020-01-22 14:10:46 +01:00
Laurent Destailleur
46df9e59ab
Merge pull request #12888 from andreubisquerra/master
...
Fix escpos DummyConnector
2020-01-22 13:56:43 +01:00
Laurent Destailleur
e96ef17737
Merge pull request #12903 from atm-john/10.0_fix_dom_and_missing_param
...
FIX dom and missing param
2020-01-22 13:45:06 +01:00
Laurent Destailleur
443e4e2223
Update html.form.class.php
2020-01-22 13:44:42 +01:00
Laurent Destailleur
395b9bf7ac
Fix syntax error
2020-01-22 13:41:05 +01:00
Laurent Destailleur
de99426247
Fix MRP
2020-01-22 12:53:51 +01:00
Laurent Destailleur
d94e091951
Can exclude some countries from list
2020-01-21 23:49:04 +01:00
Laurent Destailleur
ff9a2608d8
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
2020-01-21 22:22:16 +01:00
Laurent Destailleur
8f1737952d
Fix search on accounting account when option to padd 0 is on.
2020-01-21 22:20:32 +01:00
Laurent Destailleur
a36b0ea4f5
Fix filter on parent account in list of accounting accounts
2020-01-21 21:36:40 +01:00
Laurent Destailleur
8bd835d937
NEW Add option PDF_USE_ALSO_LANGUAGE_CODE to generate PDF in 2 languages
...
in same document.
2020-01-21 16:17:18 +01:00
Laurent Destailleur
4922567a27
Add .noexec extension for old php4, php5... files
2020-01-21 15:02:04 +01:00
Laurent Destailleur
4fdfba3867
Add .noexec extension for old php4, php5... files
2020-01-21 15:01:22 +01:00
John Botella
d6766af35d
Fix dom and missing param
2020-01-21 14:17:53 +01:00
Laurent Destailleur
b813a5a4e0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 13:03:02 +01:00
Laurent Destailleur
ca3e6ff60c
Doc
2020-01-21 12:46:28 +01:00
Laurent Destailleur
49e875aa96
Fix fatal error
2020-01-21 12:21:37 +01:00
Laurent Destailleur
a3a3835c76
Fix fatal error
2020-01-21 12:19:39 +01:00
Laurent Destailleur
a9790f355d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-21 11:32:40 +01:00
stickler-ci
b864325041
Fixing style errors.
2020-01-21 09:07:14 +00:00
Pierre Ardoin
1d4e36ba3d
Add Link to Pay if Online payment is used
...
Before : URL to Online Payment never shown.
Now : URL shown when PayPal, Stripe or PayBox are used.
2020-01-21 10:04:49 +01:00
Laurent Destailleur
4598538b42
Prepare PDF templates to use 2 languages for titles
2020-01-21 01:55:00 +01:00
Laurent Destailleur
ab5940f28c
Fix css lost
2020-01-21 00:56:32 +01:00
Laurent Destailleur
acdb28ba25
Add country id and country code in substitution vars
2020-01-21 00:28:53 +01:00
Laurent Destailleur
d6e81c5da4
Fix var not defined
2020-01-21 00:20:18 +01:00
Laurent Destailleur
d2cf4c55ee
Fix label of status
2020-01-20 23:58:01 +01:00
Laurent Destailleur
5b86851cf3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1
Doc
2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc
FIX field 'private' on email templates was not managed.
2020-01-20 18:38:53 +01:00
Laurent Destailleur
d465101ae3
Fix We should not be able to choose which permission to use to have
...
access to an object.
2020-01-20 14:29:02 +01:00
Laurent Destailleur
18f2b09fb1
Debug v11
2020-01-20 12:25:25 +01:00
Laurent Destailleur
b8938b8d19
Fix look and feel v11
2020-01-20 02:18:00 +01:00
Laurent Destailleur
65fef47bdb
Enable new pdf templates as stable
2020-01-20 01:05:30 +01:00
andreubisquerra
70362e7609
Fix travis
2020-01-19 16:44:33 +01:00
andreubisquerra
d4d0ef1295
Fix escpos DummyConnector
2020-01-19 16:16:59 +01:00
Laurent Destailleur
6fd717539d
Merge pull request #12887 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2020-01-18 20:21:29 +01:00
Laurent Destailleur
24d439845b
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
2020-01-18 20:20:25 +01:00
Laurent Destailleur
d9f7c4aec4
FIX #12838
2020-01-18 19:53:48 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
0ebed529e1
FIX #12872
2020-01-17 15:27:43 +01:00
Laurent Destailleur
9c1e409feb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-17 11:35:16 +01:00
Laurent Destailleur
d5d068e3d5
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-17 11:34:43 +01:00
Laurent Destailleur
906110dc1d
Fix backup. Recommended compression is gzip.
2020-01-17 11:34:31 +01:00
Laurent Destailleur
908a012c21
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:46 +01:00
Laurent Destailleur
c556f60c89
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-16 18:13:35 +01:00
Anthony Berton
9a6ee89d43
Update functions.lib.php
2020-01-16 15:44:07 +01:00
Anthony Berton
9a6bcaa683
Update functions.lib.php
2020-01-16 15:20:09 +01:00
Laurent Destailleur
d7423c23de
Doc
2020-01-16 12:34:53 +01:00
Laurent Destailleur
849c78f4cd
Doc
2020-01-16 10:12:39 +01:00
atm-ph
3cdb84b192
Fix note started with <s> balise
2020-01-16 09:50:57 +01:00
Scrutinizer Auto-Fixer
0aa156db78
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-16 01:54:00 +00:00
Laurent Destailleur
ad7278e6a5
FIX Label of DEPOSIT on screen
...
Fix look and feel v11
2020-01-16 02:48:24 +01:00
Laurent Destailleur
d07fa80a28
Removed export driver using phpexcel.
2020-01-15 21:09:11 +01:00
Laurent Destailleur
2c40e4be94
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 20:13:45 +01:00
Norbert Penel
3c2dd7db7c
Fix modulbuilder create forms
...
'fk_product' => array('type' => 'integer:Product:product/class/product.class.php' ...
the input was arriving with a select2 instead of an ajax search
2020-01-15 20:11:34 +01:00
Laurent Destailleur
a68da82bec
Code comment of export
2020-01-15 20:11:04 +01:00
Laurent Destailleur
98eda68afb
Fix linkg to public notes
2020-01-15 19:49:45 +01:00
Laurent Destailleur
28d5901da4
Fix error of mysqldump not thrown in some cases
2020-01-15 16:45:13 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category
2020-01-15 14:21:06 +01:00
Laurent Destailleur
373420edc0
Merge pull request #12476 from ptibogxiv/patch-280
...
NEW add total of value in product stat
2020-01-15 14:11:01 +01:00
Laurent Destailleur
34829644ed
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/time.php
2020-01-15 13:38:28 +01:00
Laurent Destailleur
486bb5cd0b
Removed useless include
2020-01-15 13:24:23 +01:00
Laurent Destailleur
43bf0a79e6
Merge pull request #12770 from guillaumematheron/develop
...
NEW 2 new options when creating an invoice from time spent on a project : by period or by task
2020-01-15 13:23:25 +01:00
Laurent Destailleur
8e269c5e64
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/core/modules/modSociete.class.php
htdocs/filefunc.inc.php
2020-01-15 13:19:37 +01:00
Laurent Destailleur
0a1a07aa22
Merge pull request #12839 from atm-gauthier/10.0_fix_importSocieteWithExtrafields
...
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-15 13:12:56 +01:00
Laurent Destailleur
e58c2c5110
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-15 12:26:48 +01:00
Laurent Destailleur
2f36e0cb1c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2020-01-15 12:26:22 +01:00
Laurent Destailleur
1d3d26e185
Fix phpcs
2020-01-15 12:26:11 +01:00
Laurent Destailleur
5772dce460
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2020-01-15 12:09:21 +01:00
Laurent Destailleur
07b12e507f
Merge pull request #12841 from bb2a/patch-10
...
Addition of delivery times substitution
2020-01-15 12:08:07 +01:00
Laurent Destailleur
c8ff847480
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/modulebuilder/index.php
2020-01-15 11:56:46 +01:00
Laurent Destailleur
0442105bd4
Fix Generation of zip of module
2020-01-15 11:55:27 +01:00
Anthony Berton
ef5c1e6c8c
Update functions.lib.php
2020-01-13 23:09:08 +00:00
Anthony Berton
1eff733e1c
Update functions.lib.php
2020-01-13 18:23:50 +01:00
Anthony Berton
f3046589e7
Update functions.lib.php
2020-01-13 18:19:51 +01:00
Anthony Berton
226dbceac0
Update functions.lib.php
2020-01-13 17:11:50 +01:00
gauthier
5455130a03
FIX : We want to be able to import data for extrafields of entity 0 too
2020-01-13 16:15:22 +01:00
Laurent Destailleur
56fb6dce61
FIX #12756
2020-01-13 15:38:46 +01:00
Laurent Destailleur
9d4e1a3941
FIX #12797
2020-01-13 14:25:48 +01:00
Laurent Destailleur
ffd12cd44e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-13 13:44:44 +01:00
Laurent Destailleur
03a1897089
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
f9e3164c6e
Merge pull request #12783 from frederic34/patch-14
...
NEW upload odt templates for shipments
2020-01-13 13:42:07 +01:00
Laurent Destailleur
ab1a56c881
Merge pull request #12781 from frederic34/patch-11
...
NEW upload odt models for invoices
2020-01-13 13:41:49 +01:00
Laurent Destailleur
4f3f933ab9
Merge pull request #12780 from frederic34/patch-8
...
NEW upload odt models for thirdparties
2020-01-13 13:41:37 +01:00
Laurent Destailleur
d04082eeee
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-13 13:21:26 +01:00
Laurent Destailleur
e88c11c417
Space
2020-01-13 13:20:58 +01:00
Laurent Destailleur
2465d5ab47
Merge pull request #12837 from laudeco/hotfix/replenish_product
...
replenish product
2020-01-13 13:18:28 +01:00
Laurent Destailleur
9c9b73e4d1
Fix translation of \n and \\s into language files.
2020-01-13 13:11:25 +01:00
Laurent Destailleur
3017d2ebe4
Merge pull request #12805 from OPEN-DSI/new-export-agenda-project-ref
...
NEW add project ref in events export
2020-01-13 11:50:39 +01:00
Laurent Destailleur
ce17f65b08
Merge pull request #12829 from atm-florian/11.0
...
Fix Warning
2020-01-13 11:39:05 +01:00
Laurent De Coninck
66e08103de
change the PHPdoc
2020-01-13 10:43:39 +01:00
Laurent Destailleur
22d4f37e58
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2020-01-10 14:31:37 +01:00
Laurent Destailleur
b47db086cb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/product/inventory/class/inventory.class.php
htdocs/product/inventory/list.php
2020-01-10 14:30:42 +01:00
Laurent Destailleur
d97a59ac4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
ChangeLog
htdocs/comm/remise.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/variants/combinations.php
2020-01-10 14:25:26 +01:00
Laurent Destailleur
c4d62e0ea3
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/list.php
2020-01-10 13:51:29 +01:00
Laurent Destailleur
9ebdd82edb
Fix We must refuse to delete a various payment if payment was dispatched
...
in accountancy.
2020-01-10 02:43:24 +01:00
Laurent Destailleur
22b6828e09
Merge pull request #12792 from aspangaro/12.0_a5
...
NEW Accountancy - Add possibility to manage an short alternative label for account - Use to simplify accountancy
2020-01-10 00:23:54 +01:00
Laurent Destailleur
e36bf0261c
Merge pull request #12811 from simicar29/develop
...
Avoid adding unsubscribed contacts in mailing list
2020-01-10 00:18:12 +01:00
Laurent Destailleur
286d278125
Merge pull request #12816 from artis-auxilium/fix_massaction_check
...
Fix Check array of action after kooks
2020-01-10 00:16:21 +01:00
Scrutinizer Auto-Fixer
8691194627
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-09 23:03:10 +00:00
Laurent Destailleur
f48c7d2ecf
Fix modulebuilder
2020-01-09 22:31:23 +01:00
Laurent Destailleur
0e58edd896
Fix modulebuilder
2020-01-09 22:27:24 +01:00
florian HENRY
2847131be0
Merge branch '11.0' of github.com:Dolibarr/dolibarr into 11.0
2020-01-09 16:31:11 +01:00
florian HENRY
83ada939d5
fix warning
2020-01-09 16:26:30 +01:00
Laurent Destailleur
255c280170
Fix visibility
2020-01-09 11:44:15 +01:00
Laurent Destailleur
20b63b702e
Fix visibility
2020-01-09 11:42:57 +01:00
Laurent Destailleur
115b7f2c6b
Fix break on second column
2020-01-09 11:05:23 +01:00
Laurent Destailleur
60935b93c0
Fix break on second column
2020-01-09 11:04:58 +01:00
Laurent Destailleur
124f41f863
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-09 09:10:11 +01:00
Laurent Destailleur
0802df78b5
Debug MRP
2020-01-08 17:56:02 +01:00
Laurent Destailleur
97f62c68f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-08 13:38:03 +01:00
Guillaume Lafarge
d9d70c10b3
Add native spellcheck to CKEditor
...
As the native spell checker is disabled by default, this PR removes the default behaviour and restore it to check for spelling and grammar in wysiwyg editor.
See : https://ckeditor.com/docs/ckeditor4/latest/features/spellcheck.html#native-browser-spell-checker
2020-01-08 10:25:58 +01:00
Dev2a
c9c22fe80b
Fix Style
2020-01-07 22:12:35 +01:00
Laurent Destailleur
622dc7e8d7
Debug v11
2020-01-07 22:01:55 +01:00
Dev2a
57c954f2e8
Fix Check array of action after kooks
2020-01-07 21:41:36 +01:00
Dev2a
0214d15c55
Fix Check array of action after kooks
2020-01-07 21:39:20 +01:00
Laurent Destailleur
ec81474694
Fix form confirm for "one column" type.
2020-01-07 20:36:36 +01:00
Laurent Destailleur
7ef3ee56bd
Fix MRP
2020-01-07 20:28:21 +01:00
Laurent Destailleur
b9a7401f1d
Doc
2020-01-07 16:29:37 +01:00
simicar29
7e29e57aff
Avoid adding unsubscribed contacts in mailing list
...
Add an sql criterion to exclude unsubscribed email adresses from count of contacts (function getNbOfRecipients) and avoid their inclusion in mailing lists (function add_to_target)
2020-01-07 16:13:48 +01:00
Laurent Destailleur
a947215ac1
Fix morecss param was lost
2020-01-07 14:40:59 +01:00
Laurent Destailleur
0e2edde6d3
Look and feel v11
2020-01-07 14:25:58 +01:00
Laurent Destailleur
f4d7958ead
Fix duplicate record in list of events for projects
2020-01-07 14:16:13 +01:00
Laurent Destailleur
f05873201c
Fix duplicate record in list of events for projects
2020-01-07 14:14:47 +01:00
Laurent Destailleur
444e2f1130
Fix length of column
2020-01-07 14:01:45 +01:00
Laurent Destailleur
eea8a4df7b
Fix length of column
2020-01-07 14:01:12 +01:00
Laurent Destailleur
750fa83e96
FIX Bad management of elementtype not llx_actioncomm
2020-01-07 13:49:52 +01:00
Laurent Destailleur
6029e82e90
FIX Bad management of elementtype not llx_actioncomm
2020-01-07 13:48:44 +01:00
Laurent Destailleur
d80764a179
Fix column not visible after switching column when visibility=3
2020-01-07 12:43:05 +01:00
Laurent Destailleur
a1803f5d62
Fix column not visible after switching column when visibility=3
2020-01-07 12:39:05 +01:00
VESSILLER
c0751a69e4
NEW add project ref in events export
2020-01-07 10:56:46 +01:00
Laurent Destailleur
8c67ea14a0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 15:30:22 +01:00
Laurent Destailleur
40ba90d170
css
2020-01-06 15:29:18 +01:00
Laurent Destailleur
063cb6bf83
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 15:14:41 +01:00
Laurent Destailleur
8384c5b03c
css
2020-01-06 15:14:14 +01:00
Laurent Destailleur
57bbac2015
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-06 14:09:46 +01:00
Laurent Destailleur
c02a27ba77
Fix log
2020-01-06 13:25:14 +01:00
Laurent Destailleur
9df85a26b8
Fix var_dump
2020-01-06 03:50:42 +01:00
Guillaume Matheron
ffa88ad11f
Merge remote-tracking branch 'upstream/develop' into develop
2020-01-05 14:51:03 +01:00
Laurent Destailleur
6dcba0f053
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-04 14:27:55 +01:00
Laurent Destailleur
38de69f5a9
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/comm/action/list.php
htdocs/compta/bank/releve.php
htdocs/compta/salaries/card.php
htdocs/core/actions_addupdatedelete.inc.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/boxes.lang
htdocs/langs/en_US/main.lang
htdocs/product/class/product.class.php
htdocs/product/reassort.php
htdocs/product/stock/product.php
htdocs/projet/element.php
2020-01-04 14:20:25 +01:00
Alexandre SPANGARO
c3518426bd
NEW Accountancy - Add possibility to manage an short alternative label - use to simplify
2020-01-03 22:05:49 +01:00
Guillaume Matheron
e9e0aae1ce
Added option to bill time spent on a task to an existing draft invoice (for instance a recurrent bill)
2020-01-02 14:59:53 +01:00
Guillaume Matheron
4f65f8d095
Fixed bug (missing include) in formmargin.class.php, affecting display of propal
2020-01-02 14:13:26 +01:00
Laurent Destailleur
aa13eb7ac4
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 23:14:33 +01:00
Laurent Destailleur
b98251f7b0
Fix phpcs
2020-01-01 23:14:13 +01:00
Laurent Destailleur
9200d7f2d7
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 23:02:02 +01:00
Laurent Destailleur
607d013a9d
Fix phpcs
2020-01-01 23:01:42 +01:00
Laurent Destailleur
b90dbb585a
Fix ident
2020-01-01 22:45:47 +01:00
Laurent Destailleur
afd32135f2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
e7ac01e1bd
FIX localtax info were not returned correctly when call done with id.
2020-01-01 22:27:47 +01:00
Laurent Destailleur
85d3b424f7
FIX: Substitution of login into link is wrong.
2020-01-01 22:27:08 +01:00
Laurent Destailleur
2e8fd25299
FIX Local taxes was not correctly supported in TakePOS.
2020-01-01 21:54:47 +01:00
Laurent Destailleur
ce7360ced3
Code comment
2020-01-01 18:43:46 +01:00
Laurent Destailleur
7d07c198bc
FIX Price of purchase order and vendor invoice with multicurrency
...
FIX entering predefined product with a forced unit price
2020-01-01 17:15:26 +01:00
Laurent Destailleur
3d98863092
Fix bad position of lang loading
2020-01-01 13:51:14 +01:00
Laurent Destailleur
bf9f9df50f
Fix var not defined
2020-01-01 13:46:09 +01:00
Laurent Destailleur
d175b34323
Fix log
2020-01-01 13:22:20 +01:00
Laurent Destailleur
821ff375b0
Fix update ref
2020-01-01 13:15:42 +01:00
Laurent Destailleur
6fdb5d8e33
FIX ref
2020-01-01 13:14:00 +01:00
Laurent Destailleur
e4a03e98b7
FIX Do not record resource owner of event when not defined.
...
More log to track payment errors.
2020-01-01 12:47:01 +01:00
Laurent Destailleur
eae0800021
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-01 11:24:10 +01:00
Laurent Destailleur
3825e9af06
FIX logo not found in some cases
2020-01-01 03:00:10 +01:00
Laurent Destailleur
4c6c8e172f
Merge pull request #12784 from Dolibarr/revert-12751-v10-fix-html-form-margin-class
...
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:33:21 +01:00
Laurent Destailleur
08d0d63a04
FIX #12760 #12763 #12755 #12765 #12751
2019-12-31 17:30:27 +01:00
Laurent Destailleur
5cc0d26eae
Revert "FIX class Facture undefined in displaying margin information"
2019-12-31 17:26:02 +01:00
Laurent Destailleur
15f1153e82
FIX Avoid line feed when 100%
2019-12-31 17:22:12 +01:00
Laurent Destailleur
76052b8bb4
FIX Avoid line feed when 100%
2019-12-31 17:19:49 +01:00
Laurent Destailleur
0c05d02265
Merge pull request #12777 from jerash/develop
...
add credit notes and deposit to getListOfPayments
2019-12-31 17:15:10 +01:00
Laurent Destailleur
bd4894d7cb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-31 17:10:53 +01:00
stickler-ci
6142e42d83
Fixing style errors.
2019-12-31 16:10:36 +00:00
Laurent Destailleur
5a692cecfb
Code comment
2019-12-31 17:10:36 +01:00
Laurent Destailleur
9774b05f52
Update commoninvoice.class.php
2019-12-31 17:10:03 +01:00
Laurent Destailleur
a369690e16
Update commoninvoice.class.php
2019-12-31 17:07:56 +01:00
stickler-ci
d3ec867df5
Fixing style errors.
2019-12-31 16:07:07 +00:00
Laurent Destailleur
b3373e8ba5
Update commoninvoice.class.php
2019-12-31 17:06:30 +01:00
Laurent Destailleur
c341ad5e8d
Update commoninvoice.class.php
2019-12-31 17:03:00 +01:00
Frédéric FRANCE
530eeffed7
NEW upload odt templates for sendings
2019-12-31 14:30:57 +01:00
Frédéric FRANCE
a7a474d032
Update doc_generic_contract_odt.modules.php
2019-12-31 14:28:14 +01:00
Frédéric FRANCE
57a5416cbc
Update doc_generic_proposal_odt.modules.php
2019-12-31 14:20:39 +01:00
Frédéric FRANCE
ee7fe66749
Update doc_generic_order_odt.modules.php
2019-12-31 14:19:31 +01:00
Frédéric FRANCE
596e2ccefc
Update doc_generic_invoice_odt.modules.php
2019-12-31 14:15:17 +01:00
Frédéric FRANCE
0c58df51d9
Update doc_generic_odt.modules.php
2019-12-31 14:14:30 +01:00
Frédéric FRANCE
b6f7394959
NEW upload odt models for invoices
2019-12-31 14:13:10 +01:00
Frédéric FRANCE
95335f402e
NEW upload odt models for thirdparties
2019-12-31 14:03:08 +01:00
Frédéric FRANCE
90235d0528
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-31 13:57:40 +01:00
stickler-ci
73e0bca359
Fixing style errors.
2019-12-31 00:13:42 +00:00
jerash
411f20c360
add credit notes and discounts to getListOfPayments
2019-12-31 01:08:25 +01:00
Laurent Destailleur
6e90e81be1
Merge pull request #12751 from OPEN-DSI/v10-fix-html-form-margin-class
...
FIX class Facture undefined in displaying margin information
2019-12-30 22:00:28 +01:00
Laurent Destailleur
aa390b8c3c
Merge pull request #12771 from tuxgasy/10.0_Fix_double_value_on_update_object
...
Fix decimal value on update object
2019-12-30 21:50:53 +01:00
TuxGasy
c9cc6cbbea
Fix decimal value on update object
2019-12-29 23:15:49 +01:00
Marc de Lima Lucio
c8dfc3d9fc
FIX: error 500 when getting margin info for objects other than invoices
2019-12-24 16:09:29 +01:00
Laurent Destailleur
d4f3d14b65
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 19:19:10 +01:00
Laurent Destailleur
9f5029aa0f
Fix warning
2019-12-23 19:17:53 +01:00
Laurent Destailleur
094b37d79d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 19:12:32 +01:00
Laurent Destailleur
8e78dbad69
Fix for php 7.4
2019-12-23 16:41:22 +01:00
Laurent Destailleur
f193d3edd8
Fix for php7.4
2019-12-23 16:38:37 +01:00
Laurent Destailleur
1ebf7e642f
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 15:49:25 +01:00
Laurent Destailleur
330cca994e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a
FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n"
2019-12-23 15:45:08 +01:00
VESSILLER
720146c45f
FIX class Facture undefined in displaying margin information
2019-12-23 15:37:12 +01:00
Laurent Destailleur
d5f6ccc7a0
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-23 14:40:36 +01:00
Laurent Destailleur
29cacec886
Fix month when using "Now" button addnowlink = 2
2019-12-23 14:39:24 +01:00
Laurent Destailleur
07c1a5717e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/facture_situation.php
htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
9a08a6bf6d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
2019-12-23 14:13:26 +01:00
Laurent Destailleur
c6ed605d26
Add missing fk_user in import list
2019-12-23 13:49:13 +01:00
Laurent Destailleur
93cece6a3a
Merge pull request #12738 from mapiolca/patch-16
...
#FIX Error Margin with Situation Invoice
2019-12-23 13:43:18 +01:00
Laurent Destailleur
a92db7db39
Look and feel v11
2019-12-23 13:02:30 +01:00
Laurent Destailleur
2df9df2db0
Debug v11
2019-12-23 12:24:27 +01:00
Laurent Destailleur
d4138876af
Fix alignement in validation popup
2019-12-23 11:16:40 +01:00
Laurent Destailleur
693551069b
Fix look and feel v11
2019-12-22 21:32:35 +01:00
Laurent Destailleur
30b8affdb7
Fix look and feel v11
2019-12-22 21:32:19 +01:00
Regis Houssin
8321fe6ad2
FIX missing nl2br conversion
2019-12-22 09:13:34 +01:00
Laurent Destailleur
ad039ff968
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
58771c7d8a
Debug MRP v11
2019-12-20 17:39:42 +01:00
Laurent Destailleur
03649ea2c8
Fix pb with svg images
2019-12-19 19:10:23 +01:00
Laurent Destailleur
43ff015157
Fix pb with svg images
2019-12-19 19:09:56 +01:00
Laurent Destailleur
44978db027
FIX The substitution variable array was not complete
2019-12-19 13:42:13 +01:00
Laurent Destailleur
0636682e91
FIX The substitution variable array was not complete
2019-12-19 13:41:43 +01:00
Laurent Destailleur
3cef84f26d
Move feature from experimental to stable
2019-12-19 12:34:58 +01:00
Frédéric FRANCE
3d19e1321b
NEW upload odt models for proposal
2019-12-19 11:10:55 +01:00
stickler-ci
863fa7360d
Fixing style errors.
2019-12-19 09:57:37 +00:00
Laurent Destailleur
dd0a1b3e10
Merge branch 'develop' into develop_project
2019-12-19 10:56:03 +01:00
Laurent Destailleur
2afaed6981
Fix bad use of MAIN_MAX_DECIMALS_UNIT_ for foreign currencies
2019-12-19 10:50:23 +01:00
Pierre Ardoin
538921f479
#FIX Error Margin with Situation Invoice
...
Fix an issue that show a negative margin when $line->situation_percent is not 100%
Now, the margin price take progress into account.
2019-12-19 10:35:38 +01:00
Laurent Destailleur
f44b85f557
Fix $_SESSION['newtoken'] must be newToken()
2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
3ae87924f1
Fix no user $global $conf into $conf object.
2019-12-18 14:32:23 +01:00
Alexandre SPANGARO
3fb72c349f
Fix language traduction on import/export tools
2019-12-18 03:25:19 +01:00
Frédéric FRANCE
b6c9de3928
upload odt models for order
2019-12-17 14:49:18 +01:00
Laurent Destailleur
a24112fc91
Merge pull request #12718 from frederic34/patch-6
...
The variable $num does not seem to be defined for all execution paths
2019-12-17 03:02:26 +01:00
Scrutinizer Auto-Fixer
404ae0c209
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-17 02:00:52 +00:00
Laurent Destailleur
138215fc3f
Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non
...
european users.
2019-12-16 22:30:16 +01:00
Laurent Destailleur
6e2e02fd40
Look and feel v11
2019-12-16 21:06:32 +01:00
Frédéric FRANCE
9fdd1357d0
The variable $num does not seem to be defined for all execution paths
2019-12-16 20:21:06 +01:00
Laurent Destailleur
a3fa6eb473
Debug v11
2019-12-16 19:40:18 +01:00
Laurent Destailleur
d22cd5c321
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c
Fix error message not reported when deleting record in ledger.
2019-12-16 19:05:32 +01:00
Laurent Destailleur
1af67a4336
Merge pull request #12713 from frederic34/doxygen_warning
...
doxygen
2019-12-16 19:02:10 +01:00
Laurent Destailleur
44c967f1cc
Merge pull request #12716 from Dolibarr/scrutinizer-patch-19
...
Scrutinizer Auto-Fixes
2019-12-16 19:01:53 +01:00
Laurent Destailleur
c3cd6ad1af
Fix example
2019-12-16 13:10:57 +01:00
Scrutinizer Auto-Fixer
c8baaa2995
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81
Debug code
2019-12-16 12:38:51 +01:00
Laurent Destailleur
646587a9cf
Value "None" To unbind is more visible.
2019-12-16 11:50:25 +01:00
Laurent Destailleur
28bcb49957
Fix css
2019-12-16 11:32:27 +01:00
John Botella
98bd4f3a66
Fix document module call
2019-12-16 09:44:08 +01:00
Laurent Destailleur
9e94be8bac
CSS
2019-12-15 20:31:09 +01:00
Laurent Destailleur
7c71f6cae9
Fix message
2019-12-15 17:48:30 +01:00
Laurent Destailleur
95fc14475c
Fix show correct stripe publishable_key on payment mode page
2019-12-15 17:32:45 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen
2019-12-15 10:02:20 +01:00
Frédéric FRANCE
8c7f0e669b
Update mod_chequereceipt_mint.php
2019-12-14 16:13:48 +01:00
Frédéric FRANCE
440b846e9a
Update mod_chequereceipt_mint.php
2019-12-14 16:12:38 +01:00
Frédéric FRANCE
ddc827e48e
Update mod_chequereceipt_thyme.php
2019-12-14 16:11:27 +01:00
Frédéric FRANCE
f15d65c2b9
doxygen
2019-12-14 16:09:48 +01:00
Laurent Destailleur
838633d0de
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
5e3698b023
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/utils.class.php
2019-12-14 14:44:38 +01:00
Laurent Destailleur
17b9964678
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
build/generate_filelist_xml.php
htdocs/core/class/utils.class.php
htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
31a60ff30b
Fix $db
2019-12-14 14:41:27 +01:00
Laurent Destailleur
d1daf94b81
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-14 14:34:14 +01:00
Laurent Destailleur
a8de7b850a
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
a0d9a7a970
Merge pull request #12704 from frederic34/patch-20
...
The property db does not exist on mod_arctic
2019-12-14 13:55:08 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo
2019-12-14 13:46:40 +01:00
Laurent Destailleur
744e7fc5da
Merge pull request #12703 from frederic34/patch-19
...
doxygen
2019-12-14 13:42:58 +01:00
Laurent Destailleur
a87372e9cd
Merge pull request #12702 from frederic34/patch-17
...
The variable $conf seems to be never defined
2019-12-14 13:42:34 +01:00
Laurent Destailleur
65bf2fa285
Merge pull request #12689 from code-chicken/develop
...
Fix: calculation of virtual stock
2019-12-14 13:40:02 +01:00
Laurent Destailleur
d38c73c90a
FIX output of emails from and error on emailing pages.
2019-12-13 15:52:08 +01:00
Frédéric FRANCE
57055bad03
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-13 14:36:00 +01:00
Frédéric FRANCE
a3dd454f86
The property db does not exist on mod_arctic
2019-12-13 08:00:34 +01:00
Rüdiger Hahn
4dd3cb3469
Prevent stock amount from becoming NULL
...
Set stock to 0 if NULL
2019-12-13 07:58:36 +01:00
Frédéric FRANCE
d4dfa840d9
doxygen
2019-12-12 20:48:14 +01:00
Frédéric FRANCE
a63caf38d3
The variable $conf seems to be never defined
2019-12-12 20:39:28 +01:00
Laurent Destailleur
bf1533e7c1
Fix HTML5
2019-12-12 11:33:07 +01:00
Laurent Destailleur
a612aefab7
Fix HTML5
2019-12-12 11:11:08 +01:00
Laurent Destailleur
ce47de453e
Fix HTML5
2019-12-12 10:31:08 +01:00
Frédéric FRANCE
9357bfd98e
doxygen
2019-12-12 08:17:14 +01:00
Frédéric FRANCE
12f84d8254
doxygen
2019-12-11 23:04:27 +01:00
Frédéric FRANCE
66805a502a
doxygen
2019-12-11 22:53:57 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo
2019-12-11 19:11:13 +01:00
Laurent Destailleur
6f4e2e7e61
Fix rounding with multicurrency
2019-12-11 17:58:14 +01:00
Laurent Destailleur
0b73cdb7cc
Fix use of currency accuracy
2019-12-11 17:14:32 +01:00
Laurent Destailleur
22a297ed47
Merge pull request #12680 from glelarge/90/12665-mass_invoice_validation_with_stock_management
...
FIX #12665 Mass invoice validation with stock management (branch 9.0)
2019-12-10 19:27:36 +01:00
Mistral Oz - LWEP
b92ec604ec
New model "Excel 2007" : first col at wrong position
...
The first column start at id 0 instead of id 1. At id 0, the first column move at Z position.
Documentation : https://phpspreadsheet.readthedocs.io/en/latest/topics/migration-from-PHPExcel/#column-index-based-on-1
2019-12-10 18:25:30 +01:00
Gérald Lelarge
97ec8b8e02
FIX #12665 Mass invoice validation with stock management
...
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-10 14:23:48 +01:00
Gérald Lelarge
5d61e53140
FIX #12665 Mass invoice validation with stock management
...
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-10 14:16:15 +01:00
VESSILLER
0396b348f7
NEW add weighted amount on project/opportunity
2019-12-10 09:32:37 +01:00
Frédéric FRANCE
f4674a7558
doxygen and $db bot defined
2019-12-10 07:51:39 +01:00
Laurent Destailleur
c0e23c7b71
Merge pull request #12670 from frederic34/patch-7
...
The variable $id seems to be never defined
2019-12-10 05:53:46 +01:00
Frédéric FRANCE
de741f5dd0
The variable $id seems to be never defined
2019-12-09 23:22:13 +01:00
Frédéric FRANCE
a16e342af6
typo
2019-12-09 23:15:15 +01:00
Laurent Destailleur
67401d717a
Merge pull request #12634 from frederic34/patch-7
...
The variable $out does not seem to be defined for all execution paths
2019-12-09 17:44:06 +01:00
Laurent Destailleur
dfeca5fae8
Fix phpcs
2019-12-09 17:42:38 +01:00
Frédéric FRANCE
407fe902b4
missing $db for line 711
2019-12-09 16:42:57 +01:00
Laurent Destailleur
ee5cac39c4
Merge pull request #12663 from Dolibarr/scrutinizer-patch-19
...
Scrutinizer Auto-Fixes
2019-12-09 16:06:38 +01:00
Laurent Destailleur
a77dc75bd4
Merge branch 'develop' into NEW_10.0_card_of_bill_created_from_template__add_link_to_template
2019-12-09 16:05:23 +01:00
Laurent Destailleur
1401daba39
Merge pull request #12667 from glelarge/12665-mass_invoice_validation_with_stock_management
...
FIX #12665 Mass invoice validation with stock management
2019-12-09 15:58:14 +01:00
Laurent Destailleur
c8f457f303
Merge pull request #12666 from atm-john/develop_fix_exif_read_data_fatal
...
Fix warning introduce by my #12605 PR #12622
2019-12-09 15:57:24 +01:00
Laurent Destailleur
04a7de14c6
Merge pull request #12660 from Ahuahuachi/develop
...
Bugfix: Module builder missing table prefix
2019-12-09 15:56:01 +01:00
Laurent Destailleur
8c50097012
Update modulebuilder.lib.php
2019-12-09 15:55:25 +01:00
Laurent Destailleur
a12b2fea80
Update modulebuilder.lib.php
2019-12-09 15:54:14 +01:00
Gérald Lelarge
903c3771ba
FIX #12665 Mass invoice validation with stock management
...
Normally the mass invoice validation is not authorized due to the need to choose the warehouse where to increase
or decrease the stock.
A message ErrorMassValidationNotAllowedWhenStockIncreaseOnAction is displayed to inform the user to do this
validation manually one by one.
The invoices should not be validated.
2019-12-09 14:59:30 +01:00
John Botella
e1cf93d9a9
Fix exif_read_data fatal error
2019-12-09 14:44:37 +01:00
Laurent Destailleur
ae6d536d1d
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/tools/dolibarr_export.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
63a26ed436
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-09 13:25:49 +01:00
Laurent Destailleur
f2c7d3de2e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:25:23 +01:00
Laurent Destailleur
5dbf060f00
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2019-12-09 13:24:01 +01:00
Laurent Destailleur
fba274997a
Merge pull request #12647 from atm-john/develop_fix_dolGetBadge
...
Fix dolGetBadge class
2019-12-09 13:05:07 +01:00
Scrutinizer Auto-Fixer
54ca37dc65
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-09 09:35:58 +00:00
Alfredo Altamirano
39afe39016
Bugfix: Module builder missing table prefix
...
The function rebuildObjectSql from the module builder module is missing the table prefix when adding a constraint
2019-12-08 19:29:46 -06:00
Laurent Destailleur
2ca5a4378b
Fix empty div when no address
...
Fix deletion of MO
2019-12-09 00:54:42 +01:00
Laurent Destailleur
9e479afff1
WIP Complete module MRP
2019-12-09 00:06:51 +01:00
Laurent Destailleur
2b5866aca2
WIP Complete module MRP
2019-12-08 23:45:06 +01:00
Laurent Destailleur
394104291a
Fix function not found when creating a payment of an expense report
2019-12-08 04:22:09 +01:00
ATM John BOTELLA
4d3ed4ffd3
Fix dolGetBadge class
2019-12-07 17:41:13 +01:00
Laurent Destailleur
d58a6a7d9a
Fix hreflang is more complete
2019-12-07 16:59:35 +01:00
Laurent Destailleur
0e063a3bb3
Fix hreflang tag (must include itself)
2019-12-07 15:46:14 +01:00
Laurent Destailleur
3f0fd9b82a
Fix url
2019-12-07 13:36:37 +01:00
Laurent Destailleur
ff05150f7e
Fix link for alternate language
2019-12-07 13:25:59 +01:00
Laurent Destailleur
7f23c5f74e
Fix link for alternate language
2019-12-07 13:21:11 +01:00
Laurent Destailleur
a2da98c08a
Fix $db not defined
2019-12-07 13:19:12 +01:00
Laurent Destailleur
7be8b14368
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-07 13:10:07 +01:00
Laurent Destailleur
3030a9fa2a
Fix manifest file was saved but not enabled.
2019-12-07 13:09:55 +01:00
Laurent Destailleur
8138fa9780
Missing X-Content-Type-Options: nosniff on header of website pages
2019-12-07 11:51:21 +01:00
Laurent Destailleur
d73bd3ee9a
Fix a supplier ref is mandatory for import
2019-12-06 18:43:13 +01:00
Laurent Destailleur
ed4f04f90a
Fix a supplier ref is mandatory for import
2019-12-06 18:41:22 +01:00
Laurent Destailleur
91d83c3d60
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-06 17:40:43 +01:00
Laurent Destailleur
796f34628d
Debug v11
2019-12-06 17:40:22 +01:00
Laurent Destailleur
a489e7ff8b
Merge pull request #12636 from Dolibarr/scrutinizer-patch-18
...
Scrutinizer Auto-Fixes
2019-12-06 16:22:07 +01:00
Laurent Destailleur
3c0dcb890b
Merge pull request #12627 from laurpaum/fix-bigint-regex
...
fix pgsql replacement pattern for bigint auto increment
2019-12-06 16:21:37 +01:00
Scrutinizer Auto-Fixer
4debd71281
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-06 08:26:49 +00:00
Laurent Destailleur
cb497cb08e
Translation
2019-12-06 08:58:16 +01:00
Laurent Destailleur
f74e1f8fa3
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-06 08:11:23 +01:00
Frédéric FRANCE
d9bfa62367
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-05 21:47:42 +01:00
Frédéric FRANCE
f101e919c8
The variable $out does not seem to be defined for all execution paths
2019-12-05 21:30:47 +01:00
Laurent Destailleur
a7571054f0
Fix if exif not available
2019-12-04 22:19:35 +01:00
Laurent Destailleur
553bb728c6
Fix break not necessary
2019-12-04 22:13:50 +01:00
Laurent Paumier
6cb3e19b7d
fix pgsql replacement pattern for bigint auto increment
2019-12-04 22:10:59 +01:00
Laurent Destailleur
5f148be56f
Fix responsive
2019-12-04 16:43:56 +01:00
Laurent Destailleur
dbee703b18
Fix responsive
2019-12-04 16:23:31 +01:00
Laurent Destailleur
b61434dbef
Avoid log
2019-12-04 15:55:22 +01:00
Laurent Destailleur
b78f310508
Reponsive
2019-12-04 15:49:22 +01:00
Laurent Destailleur
bde917d7fc
Fix responsive
2019-12-04 15:09:20 +01:00
Laurent Destailleur
9878eddd75
Fix phpcs
2019-12-03 22:52:20 +01:00
Laurent Destailleur
13acb8537d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-12-03 22:38:10 +01:00
Laurent Destailleur
a75915a7a8
Fix regression
2019-12-03 22:37:58 +01:00
Laurent Destailleur
8006d08e6b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-12-03 22:36:37 +01:00
Laurent Destailleur
60d3bd0fe9
Fix regression
2019-12-03 22:36:26 +01:00
Laurent Destailleur
21a0e962ad
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-12-03 22:35:01 +01:00
Laurent Destailleur
558e0cb5f6
Fix regression
2019-12-03 22:34:49 +01:00
Laurent Destailleur
22b17190e8
Update pdf.lib.php
2019-12-03 22:26:33 +01:00
stickler-ci
24b5b9bd72
Fixing style errors.
2019-12-03 18:42:29 +00:00
Philippe GRAND
0ce1e5c007
Fix : Fatal error: Uncaught Error: Class Facture not found
2019-12-03 19:39:32 +01:00
Laurent Destailleur
5a17289e75
Fix crop for proposal image
2019-12-03 18:04:58 +01:00
Laurent Destailleur
576006ff6c
Merge pull request #12605 from atm-john/10.0_fix_exif_images
...
Fix Use dynamically exif image information with conf MAIN_USE_EXIF_ROTATION
2019-12-03 17:57:19 +01:00
Frédéric FRANCE
4c5c6b6ff1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-03 17:56:43 +01:00
John Botella
e46f654e9f
Fix deprecated image2wbmp function
2019-12-03 17:27:13 +01:00
gauthier
cec54d6ce0
FIX : when we need to bill several orders, order lines unit is not on bill lines
2019-12-03 16:40:35 +01:00
Laurent Destailleur
606a13898c
Merge pull request #12394 from mapiolca/patch-15
...
Fix problem of display photo in the model
2019-12-03 16:16:57 +01:00
Laurent Destailleur
41a176ce72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/remx.php
htdocs/core/modules/modStripe.class.php
htdocs/product/stock/replenish.php
htdocs/stripe/payout.php
2019-12-03 13:58:15 +01:00
Laurent Destailleur
6ac5e1a4f3
Merge pull request #12601 from TobiasSekan/FixAddFolderSymbolAccess
...
Fix style of add folder button based on rights
2019-12-03 13:46:21 +01:00
Laurent Destailleur
2d95544abd
Update filemanager.tpl.php
2019-12-03 13:46:12 +01:00
Laurent Destailleur
b1f2495771
Merge pull request #12598 from frederic34/patch-15
...
The property db does not exist on mod_livraison_saphir
2019-12-03 13:26:16 +01:00
Laurent Destailleur
87aaa5b11d
Merge pull request #12597 from frederic34/patch-14
...
The property db does not exist on mod_supplier_proposal_saphir
2019-12-03 13:26:03 +01:00
Laurent Destailleur
9400d44f83
Merge pull request #12596 from frederic34/patch-13
...
The property db does not exist on mod_reception_moonstone
2019-12-03 13:25:51 +01:00
Laurent Destailleur
a56d4407ca
Merge branch 'develop' into patch-11
2019-12-03 13:25:19 +01:00
Laurent Destailleur
573aac8b04
Merge pull request #12594 from frederic34/patch-8
...
The variable xxx does not seem to be defined for all exec paths
2019-12-03 13:22:18 +01:00
Laurent Destailleur
8f39fec121
Merge pull request #12600 from TobiasSekan/FixEcmSymbolsAccess
...
Fix shown ECM symbols on missing access
2019-12-03 13:21:42 +01:00
Laurent Destailleur
d93cfedcbe
Merge pull request #12602 from TobiasSekan/AddMoreFilesForPreview
...
Add preview button for MD, CSS, XAML files
2019-12-03 13:20:08 +01:00
Laurent Destailleur
ed462190f6
Merge pull request #12607 from frederic34/patch-18
...
doxygen
2019-12-03 13:18:48 +01:00
Scrutinizer Auto-Fixer
36a74cd160
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-03 10:17:29 +00:00
John Botella
f806c0da78
Fix comment missing
2019-12-03 09:29:04 +01:00
John Botella
2b01576aa9
Fix comment
2019-12-03 09:24:11 +01:00
ptibogxiv
b67fb8be02
Fix stripe menu
2019-12-03 00:14:05 +01:00
Frédéric FRANCE
261e166029
doxygen
2019-12-02 20:18:12 +01:00
John Botella
3b72cade4e
Fix exif image with conf MAIN_USE_EXIF_ROTATION
2019-12-02 17:32:06 +01:00
Florian Mortgat
4846885eea
NEW 9.0: enable user to use the mysqldump '--quick' option
...
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Tobias Sekan
f4e4e1e518
Add preview for MD, CSS, XAML files
2019-12-02 13:53:28 +01:00
Tobias Sekan
d7a8fb98fc
Fix style of add folder button based on rights
2019-12-02 13:02:16 +01:00
Tobias Sekan
18db8dd900
Fix shown ECM symbols on missing access
2019-12-02 11:34:35 +01:00
Laurent Destailleur
6f7343b14f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-12-02 11:01:26 +01:00
Laurent Destailleur
6d81bc77cb
Fix look and feel v11
2019-12-02 11:00:09 +01:00
Laurent Destailleur
92070fa491
Fix name of variable $trigger_name into $triggersendname
2019-12-02 09:38:16 +01:00
Laurent Destailleur
32a539a8c0
Update website templates
2019-12-02 09:19:05 +01:00
Laurent Destailleur
7908e0cd26
Fix crop for MO
2019-12-02 08:46:59 +01:00
Frédéric FRANCE
0b37d54841
The property db does not exist on mod_livraison_saphir
2019-12-01 20:58:45 +01:00
Frédéric FRANCE
5d9901bf59
The property db does not exist on mod_supplier_proposal_saphir
2019-12-01 20:57:14 +01:00
Frédéric FRANCE
318ba895e5
The property db does not exist on mod_reception_moonstone
2019-12-01 20:55:22 +01:00
Frédéric FRANCE
c780838e34
The property db does not exist on mod_propale_saphir
2019-12-01 20:50:18 +01:00
Frédéric FRANCE
454d79db58
The variable xxx does not seem to be defined for all exec paths
2019-12-01 20:44:13 +01:00
Laurent Destailleur
5cb014435b
Try better fix for #12567
2019-12-01 19:29:53 +01:00
Laurent Destailleur
af5beade41
Merge pull request #12584 from atm-john/develop_add_link_to_widget
...
NEW link to widget
2019-12-01 19:13:10 +01:00
Frédéric FRANCE
1d0900445b
The variable $letter does not seem...
...
The variable $letter does not seem to be defined for all execution paths
2019-12-01 18:52:50 +01:00
Laurent Destailleur
7407df2fa3
Merge pull request #12590 from frederic34/patch-7
...
The variable $arraylist seems to be defined...
2019-12-01 18:42:03 +01:00
Frédéric FRANCE
3227f12a6e
The variable $arraylist seems to be defined...
...
The variable $arraylist seems to be defined by a foreach iteration. Are you sure the iterator is never empty, otherwise this variable is not defined?
2019-12-01 18:27:06 +01:00
Frédéric FRANCE
41b5e82d48
The variable $error seems to be never defined
2019-12-01 16:42:18 +01:00
Frédéric FRANCE
25ed2b930f
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-12-01 16:10:37 +01:00
Laurent Destailleur
408c8ccd67
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-12-01 12:51:17 +01:00
Laurent Destailleur
f378141fbd
PHPCS
2019-12-01 12:51:01 +01:00
Laurent Destailleur
d900475c5d
Merge pull request #12571 from inoveaconseil/FIX#12473
...
Fix#12473
2019-12-01 12:42:01 +01:00
Laurent Destailleur
3eec2430eb
Merge pull request #12585 from atm-john/develop_factoring_token_usage
...
Factoring token usage
2019-12-01 11:37:30 +01:00
Laurent Destailleur
790fdc881c
# WARNING: head commit changed in the meantime
...
Restore file for travis
2019-12-01 10:50:56 +01:00
Laurent Destailleur
bf99e8af5d
Fix phpcs
2019-12-01 10:33:55 +01:00
Laurent Destailleur
6bf3af5d83
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/core/lib/pdf.lib.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
2019-12-01 10:30:22 +01:00
ATM John BOTELLA
773f823748
factoring token usage
2019-12-01 10:20:11 +01:00
ATM John BOTELLA
096e50aaf6
add link to widget
2019-12-01 10:08:43 +01:00
Laurent Destailleur
1d564c2a39
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/core/class/notify.class.php
2019-12-01 00:58:01 +01:00
Laurent Destailleur
bfb8a4e8da
Merge pull request #12578 from Dolibarr/revert-12577-#12482
...
Revert "FIX#12482"
2019-12-01 00:55:13 +01:00
Laurent Destailleur
199b0c11af
Merge pull request #12572 from atm-maxime/fix_deposit
...
Fix deposit line was not translated in deposit invoice
2019-12-01 00:44:17 +01:00
Laurent Destailleur
7931bfa766
Merge pull request #12568 from atm-john/develop_fix_divide_by_zero
...
Fix division by zero
2019-11-30 23:29:11 +01:00
Laurent Destailleur
47b35e9011
Merge pull request #12570 from atm-maxime/fix_margin_rights
...
Fix margin rights
2019-11-30 23:28:26 +01:00
Maxime Kohlhaas
edb8bcb598
Fix PDF rouget for SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME
2019-11-30 22:58:32 +01:00
Laurent Destailleur
a352fd5a6e
Revert "FIX#12482"
2019-11-30 21:00:56 +01:00
Nicolas
f2ff443641
FIX #12482
2019-11-30 20:04:27 +01:00
Maxime Kohlhaas
558669dd88
Fix #6497 : deposit lines were not translated
2019-11-30 16:14:16 +01:00
Maxime Kohlhaas
2c165d0a61
Fix deposit date display in PDF
2019-11-30 15:53:50 +01:00
stickler-ci
a13b2267aa
Fixing style errors.
2019-11-30 14:22:25 +00:00
Maxime Kohlhaas
916954b301
Fix #12371 : access rights on contacts
2019-11-30 14:48:05 +01:00
Maxime Kohlhaas
9095482113
Fix margins access + menu display
2019-11-30 14:47:48 +01:00
Nicolas
fd7a18c26f
FIX #12473
2019-11-30 12:49:31 +01:00
ATM John BOTELLA
b7d39b610b
Fix divided by zero
2019-11-30 10:08:55 +01:00
Laurent Destailleur
35b4318cee
Merge pull request #12552 from frederic34/patch-15
...
$head was never initialized
2019-11-30 01:16:40 +01:00
Maxime Kohlhaas
02b5da5db1
Fix #12448 : notifications were sent to disabled user or contacts
2019-11-30 00:57:21 +01:00
Laurent Destailleur
0a3614adbf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-29 11:42:16 +01:00
Laurent Destailleur
3b9d2abcb2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/product.lib.php
htdocs/filefunc.inc.php
htdocs/product/class/product.class.php
htdocs/product/list.php
2019-11-29 11:42:08 +01:00
Laurent Destailleur
3acd0bc2ff
FIX Reduce number of request for list of products
2019-11-29 11:32:09 +01:00
Laurent Destailleur
eed8f242b8
Update demo
2019-11-29 10:23:18 +01:00
Frédéric FRANCE
00a80e498e
$head was never initialized
2019-11-28 23:06:04 +01:00
Laurent Destailleur
1636d341c7
Debug module BOM
...
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Laurent Destailleur
614b82fe88
Fix var not initialized
2019-11-28 14:16:54 +01:00
Scrutinizer Auto-Fixer
5f99e25c45
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
552f2088f9
Merge pull request #12532 from frederic34/patch-15
...
The property rowid does not seem to exist on Adherent.
2019-11-28 12:21:35 +01:00
Laurent Destailleur
540f47b998
Merge pull request #12523 from oscim/patch-11
...
Put $object in complete_head_from_modules
2019-11-28 12:20:16 +01:00
Laurent Destailleur
1e84b0ea97
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
...
Scrutinizer Auto-Fixes
2019-11-28 12:19:43 +01:00
Laurent Destailleur
874f5b7005
Merge pull request #12528 from frederic34/patch-8
...
image2wbmp() is deprecated as of PHP 7.3.0
2019-11-28 12:19:32 +01:00
Frédéric FRANCE
b2912e688b
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-27 22:54:05 +01:00
Laurent Destailleur
20b52db5b8
Merge pull request #12527 from frederic34/patch-7
...
dol_print_error returns void
2019-11-27 20:11:40 +01:00
Laurent Destailleur
c0d349e9f7
Merge pull request #12530 from frederic34/patch-13
...
fix doxygen
2019-11-27 20:11:24 +01:00
Laurent Destailleur
c22fea52e5
Fix do not ping name of server
2019-11-27 11:38:30 +01:00
Laurent Destailleur
9a9a43fc4d
Return OS with ping
2019-11-27 11:34:10 +01:00
altairis
355d7545f6
filter language is an array
2019-11-27 10:23:01 +01:00
Frédéric FRANCE
32aca5f186
Update pdf_standard.class.php
2019-11-26 19:52:10 +01:00
Frédéric FRANCE
757d05e907
fix doxygen
2019-11-26 18:59:26 +01:00
Frédéric FRANCE
a04fa05b6c
image2wbmp() is deprecated as of PHP 7.3.0
...
https://www.php.net/manual/en/function.image2wbmp.php
image2wbmp() is deprecated as of PHP 7.3.0, and will be removed in the next major version. Use imagewbmp() instead.
2019-11-26 18:41:38 +01:00
Frédéric FRANCE
c7e8194df9
dol_print_error returns void
2019-11-26 18:28:44 +01:00
Laurent Destailleur
3a687b1dae
Fix box of task hidden if tasks are not used
2019-11-26 17:44:21 +01:00
oscim
1e6b93500a
Put $object in complete_head_from_modules
...
Add object for correctly usage in function complete_head_from_modules
2019-11-26 16:34:16 +01:00
Scrutinizer Auto-Fixer
057ab6a059
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-26 11:52:04 +00:00
Laurent Destailleur
4ef6c9cc13
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
2019-11-26 11:54:42 +01:00
Laurent Destailleur
d1419f81da
Merge pull request #12390 from bb2a/patch-4
...
Use english name of subsitution variables for thirdparties
2019-11-26 10:26:45 +01:00
Laurent Destailleur
b370d70426
Merge pull request #12511 from erpware/develop
...
just fixed two small css issues
2019-11-26 09:20:40 +01:00
Laurent Destailleur
0032b27a8e
Merge pull request #12517 from frederic34/patch-16
...
$out does not seem to be defined for all execution paths
2019-11-26 09:14:55 +01:00
Laurent Destailleur
cee40561df
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-11-26 09:13:52 +01:00
Laurent Destailleur
b0b579bdbf
Fix phpcs
2019-11-26 09:13:35 +01:00
Laurent Destailleur
034267edbf
Merge pull request #12516 from frederic34/patch-15
...
doxygen
2019-11-26 09:11:10 +01:00
Laurent Destailleur
b44817f2bf
Merge pull request #12518 from frederic34/patch-17
...
doxygen
2019-11-26 09:10:47 +01:00
Frédéric FRANCE
4c4ae5b6e1
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-26 08:10:40 +01:00
Alexandre SPANGARO
6cc61fef9c
Fix Ticket - Deprecated <center>
2019-11-26 04:32:38 +01:00
Frédéric FRANCE
1ccf0808d0
doxygen
2019-11-26 00:28:26 +01:00
Frédéric FRANCE
a142c0050e
$out does not seem to be defined for all execution paths
2019-11-26 00:24:00 +01:00
Frédéric FRANCE
77a300c9ae
doxygen
2019-11-26 00:20:40 +01:00
andreubisquerra
6baa1c8d4a
Fix travis
2019-11-25 23:32:40 +01:00
Daniel Seichter
7a4beb824f
Merge remote-tracking branch 'upstream/develop' into develop
2019-11-25 23:14:19 +01:00
Daniel Seichter
9eafc8f550
fix small css issues
2019-11-25 23:13:31 +01:00
andreubisquerra
b2e995279e
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
2019-11-25 19:29:07 +01:00
Laurent Destailleur
61f414488a
Fix translation
2019-11-24 18:34:07 +01:00
Laurent Destailleur
bc5270ce76
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2019-11-24 18:15:25 +01:00
Laurent Destailleur
712ae48e4e
Fix default setup
2019-11-24 18:07:38 +01:00
Laurent Destailleur
cf0311dd6a
FIX Hook getAccessForbiddenMessage was missing parameters
2019-11-22 16:13:22 +01:00
Laurent Destailleur
32f590f274
Merge pull request #12485 from aspangaro/12.0_a2
...
NEW Add shipment widget
2019-11-22 14:39:56 +01:00
Laurent Destailleur
e2009ceff0
Fix extrafields of line for receptions
2019-11-22 14:22:35 +01:00
Laurent Destailleur
00ad95c01e
Figth against useless dependencies: Remove library the core never use.
2019-11-22 14:06:43 +01:00
Laurent Destailleur
1ed2eacbef
Debug add email profile
2019-11-22 12:40:17 +01:00
Laurent Destailleur
6191307865
Debug v11
2019-11-22 12:22:27 +01:00
Alexandre SPANGARO
f4e1361d06
NEW small fix
2019-11-22 06:53:05 +01:00
Laurent Destailleur
92a65a8039
Log
2019-11-21 21:36:03 +01:00
Laurent Destailleur
5fdd6f698d
More complete error message
...
Conflicts:
htdocs/core/class/CMailFile.class.php
2019-11-21 20:46:27 +01:00
Laurent Destailleur
b46362dff9
More complete error message
2019-11-21 20:45:19 +01:00
Laurent Destailleur
e8bc8b68c1
Fix missing field in migration
2019-11-21 18:17:40 +01:00
Anthony Berton
496aa0c065
Update functions.lib.php
2019-11-21 10:38:59 +01:00
Alexandre SPANGARO
2f064567ef
NEW Add shipment widget
2019-11-21 07:50:44 +01:00
Laurent Destailleur
58c38912ab
Fix action into actionlogin to avoid conflict
2019-11-20 16:42:18 +01:00
stickler-ci
3209d550c2
Fixing style errors.
2019-11-20 11:45:12 +00:00
ptibogxiv
2c810988a6
Update dolgraph.class.php
2019-11-20 12:43:49 +01:00
Frédéric FRANCE
d182eee4bf
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-19 23:26:00 +01:00
Laurent Destailleur
2f3b4d239b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-19 18:56:12 +01:00
Laurent Destailleur
6bfb76d40d
Merge pull request #12464 from bb2a/patch-6
...
Update getfullname
2019-11-19 10:55:47 +01:00
Scrutinizer Auto-Fixer
cd7523318d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
5b6f0cb101
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
2019-11-18 21:19:10 +01:00
Laurent Destailleur
918f476c2b
Fix backport fix not checking mandatory extrafields of type select
2019-11-18 19:02:12 +01:00
Frédéric FRANCE
2e5f539b2a
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-18 17:45:52 +01:00
Laurent Destailleur
ae0fdf014f
Debug email collector. Missing unique key. Fix initial setup.
2019-11-18 11:55:22 +01:00
Laurent Destailleur
b69a7f9709
css
2019-11-17 20:25:39 +01:00
Laurent Destailleur
16d67a1a8e
Fix several trouble with some types in modulebuilder
...
Fix difference between null and 0
2019-11-17 17:36:36 +01:00
Anthony Berton
7a5883588c
Update commonobject.class.php
2019-11-17 14:07:01 +01:00
Anthony Berton
fe3c921152
Merge branch 'develop' into patch-4
2019-11-17 10:17:47 +01:00
Scrutinizer Auto-Fixer
1648fc142e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-16 22:24:29 +00:00
Anthony Berton
e1f36ae107
Update functions.lib.php
2019-11-16 17:37:18 +01:00
Laurent Destailleur
2689f7515c
Fix pb with colspan and extrafields.
...
Fix remove empty id
2019-11-16 14:38:05 +01:00
Laurent Destailleur
c5b83ca3d8
Fix link translation of
2019-11-16 12:43:44 +01:00
Frédéric FRANCE
6784ea9fae
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-16 09:21:57 +01:00
Laurent Destailleur
e5daa73a9e
Merge pull request #12444 from frederic34/doxygen_menubase
...
doxygen menubase class
2019-11-16 00:45:30 +01:00
Laurent Destailleur
3898db3956
FIX #12446
2019-11-16 00:39:23 +01:00
Laurent Destailleur
1f5bea01f5
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.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/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
2019-11-14 21:30:16 +01:00
Frédéric FRANCE
7100328116
doxygen menubase class
2019-11-14 21:25:12 +01:00
Laurent Destailleur
7e52c70321
FIX Advisory ID: usd20190067
2019-11-14 21:16:18 +01:00
Laurent Destailleur
f7ab1498a7
FIX Advisory ID: usd20190053
2019-11-14 17:00:02 +01:00
Laurent Destailleur
80b3e27341
Fix bad name of constant
2019-11-14 14:23:48 +01:00
Laurent Destailleur
7e0ae4bf0e
FIX The pdf templates were using the large logo making PDF too large
2019-11-14 14:17:22 +01:00
Laurent Destailleur
7d997990fa
Fix phpcs
2019-11-14 12:44:15 +01:00
Laurent Destailleur
8db4eff108
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
...
Scrutinizer Auto-Fixes
2019-11-14 12:10:44 +01:00
Scrutinizer Auto-Fixer
f197196719
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:46 +00:00
Scrutinizer Auto-Fixer
ddcc14dc16
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
411e9c87e3
Debug feature to set sender profiles
2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2
Fix when limit = 0
...
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
75667833fe
Fix missing ->msgid
2019-11-14 10:01:05 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
2019-11-14 09:21:26 +01:00
Laurent Destailleur
95a6d7f8f5
Doxyen
2019-11-14 09:13:15 +01:00
Laurent Destailleur
56f2463a15
Merge branch 'develop' into patch-6
2019-11-14 08:53:53 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
...
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Laurent Destailleur
614faa07c1
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2019-11-14 08:49:53 +01:00
Frédéric FRANCE
6596ffac4f
Update conf.class.php
2019-11-13 20:20:35 +01:00
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Laurent Destailleur
545c2207b2
Fix on exact date when we don't know the second is useless
2019-11-13 19:32:27 +01:00
Laurent Destailleur
b9900c20cc
Merge pull request #11035 from atm-ph/new_search_input_on_type_list
...
NEW show html list instead input text for extrafields typed as list
2019-11-13 19:26:19 +01:00
Laurent Destailleur
88d2658625
Merge branch 'develop' into scrutinizer-patch-2
2019-11-13 19:14:50 +01:00
Laurent Destailleur
65dc46db63
Merge pull request #12424 from Dolibarr/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2019-11-13 19:12:17 +01:00
Frédéric FRANCE
05ab4f79ef
categories for actioncomm
2019-11-13 18:44:11 +01:00
Laurent Destailleur
78b6246e43
Merge pull request #12420 from fappels/debug_11
...
Cleanup interface_90_modSociete_ContactRoles
2019-11-13 18:35:28 +01:00
Laurent Destailleur
ede05e03ba
Merge pull request #12417 from frederic34/patch-7
...
doxygen
2019-11-13 18:34:29 +01:00
Scrutinizer Auto-Fixer
87585c0f2a
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:32:11 +00:00
Scrutinizer Auto-Fixer
c66bce7ec6
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 17:31:18 +00:00
Laurent Destailleur
7118dbbd1d
Fix var not defined
2019-11-13 18:25:48 +01:00
Laurent Destailleur
bdf0219941
Missing link to create contact
...
Fix css
2019-11-13 18:18:45 +01:00
Laurent Destailleur
74239d48bf
Fix translation of extrafields when $extralabels not loaded
2019-11-13 11:11:08 +01:00
Laurent Destailleur
56c2dc2614
Reduce need of translations
2019-11-12 22:29:36 +01:00
Francis Appels
9efcdc78f9
Cleanup interface_90_modSociete_ContactRoles
2019-11-12 21:56:05 +01:00
Laurent Destailleur
89bf35a8bf
Fix default value show must match the theme selected
2019-11-12 21:54:41 +01:00
Frédéric FRANCE
7ce297c6cc
doxygen
2019-11-12 21:53:17 +01:00
Laurent Destailleur
2c718af26c
Missing container type 'menu'
...
Fix: Add security if container is not a page
2019-11-12 13:55:46 +01:00
Laurent Destailleur
528823140d
Fix phpcs
2019-11-12 12:05:06 +01:00
Laurent Destailleur
6afc84fe72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 10:20:55 +01:00
Laurent Destailleur
944a15d06b
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-11-12 10:20:16 +01:00
Laurent Destailleur
f8e8d15606
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-11-12 10:19:01 +01:00
Laurent Destailleur
f65ce1d5d0
Fix var not declared
2019-11-12 10:17:46 +01:00
Scrutinizer Auto-Fixer
c85e54b08c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Laurent Destailleur
dc77a58a73
Work on MO
2019-11-12 01:48:12 +01:00
Laurent Destailleur
03e35623c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-12 00:43:37 +01:00
Laurent Destailleur
8be0a6d470
Fix: Can set savingdocmask by caller. Fix permissions names.
...
Fix: Disable crop on svg images.
2019-11-12 00:43:26 +01:00
Scrutinizer Auto-Fixer
038bda254d
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 22:59:36 +00:00
Laurent Destailleur
814dce5b55
Fix var not defined
2019-11-11 19:26:19 +01:00
Laurent Destailleur
2ccef4e469
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
2019-11-11 19:10:35 +01:00
Laurent Destailleur
5eb03cf6ad
Avoid false positive.
2019-11-11 13:26:48 +01:00
Laurent Destailleur
6a4ba74ee7
Fix regression introduced by 991e1b2747
2019-11-11 13:17:36 +01:00
Laurent Destailleur
27fb9e0c7f
Merge pull request #12401 from grandoc/new_branch_10_11_2019
...
add some comment
2019-11-10 18:07:13 +01:00
Laurent Destailleur
0a824db6d3
Remove useless call
2019-11-10 17:48:50 +01:00
Laurent Destailleur
6990732c71
Fix missing action in POST
2019-11-10 13:49:04 +01:00
stickler-ci
f8138c22a3
Fixing style errors.
2019-11-10 10:12:10 +00:00
Philippe GRAND
9bf4347371
add some comment
2019-11-10 11:11:43 +01:00
Laurent Destailleur
5b6ace387e
Debug BOM and MO module
2019-11-09 19:47:49 +01:00
Laurent Destailleur
771f304c79
Fix typo
2019-11-09 18:40:08 +01:00
Laurent Destailleur
6233f8e1c5
Fix visibility = 3
2019-11-09 18:19:04 +01:00
Laurent Destailleur
94fce39562
Fix visibility on modulebuilder
2019-11-09 18:13:59 +01:00
BENKE Charlene
53fd8328bc
add certificate if present on document folder
2019-11-09 15:20:36 +01:00
Laurent Destailleur
5ebd5a401c
Fix avoid error on lang not defined when calling trigger
2019-11-09 13:09:05 +01:00
Laurent Destailleur
ab26356e92
Fix avoid error on lang not defined when calling trigger
2019-11-09 13:08:30 +01:00
Laurent Destailleur
fcf983ee23
Fix decimal separator according to lang setup
...
Conflicts:
htdocs/core/actions_addupdatedelete.inc.php
2019-11-09 12:56:34 +01:00
Laurent Destailleur
75e2d412ac
Fix decimal separator according to lang setup
2019-11-09 12:54:11 +01:00
Laurent Destailleur
c0abb725cb
Fix price2num needs lang loaded when it may not exists
2019-11-09 12:46:45 +01:00
Laurent Destailleur
f9869dbfed
Fix price2num need langs when lang is not necessarly loaded.
2019-11-09 12:46:11 +01:00
Laurent Destailleur
917c8df225
Add type of db driver in stats
2019-11-09 12:24:18 +01:00
Laurent Destailleur
dcdcd7c67e
Look and feel v11
2019-11-09 12:03:11 +01:00
Pierre Ardoin
88fb094a78
Fix problem of display photo in the model
...
Fix a problem with photo in the model :
Before : Check in the current entity the product's repertory to find a photo
Now : Check all entities product's repertories to find a photo
2019-11-08 22:02:30 +01:00
Laurent Destailleur
8f35c24b62
Add quick hack by hidden const as solution when numbering is locked.
2019-11-08 16:37:25 +01:00
Anthony Berton
4449c6d2a7
Update functions.lib.php
2019-11-08 16:34:20 +01:00
Scrutinizer Auto-Fixer
812d0af1d9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Laurent Destailleur
83090629fe
Fix join into left join
2019-11-08 13:43:26 +01:00
Laurent Destailleur
e513917d12
Fix phpcs
2019-11-08 11:34:14 +01:00
Laurent Destailleur
d1c49c7021
Fix trans
2019-11-08 10:24:03 +01:00
Laurent Destailleur
f11943126a
Fix scrutinizer
2019-11-08 09:42:39 +01:00
Laurent Destailleur
34beca0758
Fix var not not consistent
2019-11-07 16:33:11 +01:00
Laurent Destailleur
8318db85a3
Fix typo
2019-11-07 16:32:44 +01:00
Laurent Destailleur
c0b8684475
Merge pull request #12341 from inoveaconseil/bankStatementDocument
...
NEW add upload for account statement
2019-11-07 15:06:47 +01:00
Laurent Destailleur
1f0cee2139
Merge pull request #12376 from TobiasSekan/FixNotDeactivatedCommercialButton
...
Fix not deactivated commercial menu button
2019-11-07 15:05:26 +01:00
Laurent Destailleur
3b44760e65
FIX #12356
2019-11-07 14:10:07 +01:00
Laurent Destailleur
f84087ba70
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-07 14:08:01 +01:00
Laurent Destailleur
1fa61077a0
FIX #12356
2019-11-07 14:07:50 +01:00
Tobias Sekan
7dc94f1761
Fix not deactivated commercial menu button
2019-11-07 13:50:25 +01:00
Scrutinizer Auto-Fixer
0b406172fd
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
f1ebfb1ba7
Merge pull request #12369 from TobiasSekan/FixAccessMainMenu
...
Fix main menu access for only shipment rights
2019-11-07 12:55:11 +01:00
Laurent Destailleur
4f219ae0fb
Fix doc
2019-11-07 11:16:59 +01:00
Laurent Destailleur
4433cff49d
Merge pull request #12346 from frederic34/centpercent
...
100% centpercent
2019-11-07 10:39:09 +01:00
Laurent Destailleur
5b13b9f1ff
Merge pull request #12358 from frederic34/patch-20
...
dol_hash may salt so gravatar is not working
2019-11-07 10:37:45 +01:00
Tobias Sekan
5de36b2bab
Fix main menu access for only shipment rights
2019-11-07 09:48:46 +01:00
Nicolas
f18bca7687
Merge remote-tracking branch 'origin/bankStatementDocument' into bankStatementDocument
2019-11-06 20:51:17 +01:00
Inovea Conseil
fed6ed8760
Merge remote-tracking branch 'Dolibarr/develop' into bankStatementDocument
2019-11-06 20:48:24 +01:00
Laurent Destailleur
74f2983ee1
Debug modulebuilder
2019-11-06 19:38:51 +01:00
Frédéric FRANCE
a1c8e04646
dol_hash may salt so gravatar is not working
2019-11-06 07:50:21 +01:00
Laurent Destailleur
027d94d41a
Revert change that create not required new lines
2019-11-06 00:51:26 +01:00
Laurent Destailleur
e885345ef7
FIX Check on duplicate profid was not triggered.
2019-11-06 00:27:36 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Laurent Destailleur
7c4942b7be
Fix debug BOM/MO
2019-11-05 20:14:33 +01:00
Laurent Destailleur
94bd0f71d9
Fix pb with permission
2019-11-05 19:41:30 +01:00
Laurent Destailleur
84a8d4e7cb
Debug BOM/MO
2019-11-05 19:18:12 +01:00
Laurent Destailleur
204475efb9
Removed deprecated file
2019-11-05 19:10:29 +01:00
Laurent Destailleur
4c01f33228
Fix removed a debug die
2019-11-05 15:57:22 +01:00
stickler-ci
f537ae60b6
Fixing style errors.
2019-11-05 12:52:58 +00:00
Nicolas
991e1b2747
NEW Add upload document on account statement
2019-11-05 13:51:52 +01:00
Laurent Destailleur
85ce5176b5
Fix textarea to enter a ticket
2019-11-05 13:41:01 +01:00
Laurent Destailleur
7ab19ef66b
Fix selection not lose if creation of vendor invoice fails
2019-11-05 13:34:25 +01:00
Laurent Destailleur
ce1dec253f
FIX #11364
2019-11-05 12:47:38 +01:00
Laurent Destailleur
4d84ee2041
Fix var not init
2019-11-05 10:15:00 +01:00
Laurent Destailleur
c0daa1e5d3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-05 10:11:49 +01:00
Laurent Destailleur
9499398f86
Code syntax
2019-11-05 10:11:28 +01:00
Laurent Destailleur
57a7370f22
Merge pull request #12327 from frederic34/patch-3
...
config file doesn't exists
2019-11-05 10:04:01 +01:00
Laurent Destailleur
b4d72e3e96
Fix link to setup of social network module
2019-11-05 10:00:46 +01:00
Laurent Destailleur
747113551b
Debug pagination of bookmark list
2019-11-05 09:52:33 +01:00
Frédéric FRANCE
d035aefd40
config file doesn't exists
2019-11-04 21:58:40 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
...
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Laurent Destailleur
562e219cc5
Merge pull request #12314 from frederic34/patch-7
...
add thirdparty email in box_propales
2019-11-04 20:51:57 +01:00
Laurent Destailleur
17ea978cea
Merge pull request #12306 from frederic34/escpos
...
Escpos
2019-11-04 20:40:12 +01:00
Laurent Destailleur
c276659acd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/ticket.lib.php
2019-11-04 20:37:49 +01:00
Laurent Destailleur
e60fff39d9
Fix phpcs
2019-11-04 20:36:55 +01:00
Laurent Destailleur
0347d82660
Merge pull request #12303 from frederic34/patch-2
...
css
2019-11-04 20:31:02 +01:00
Laurent Destailleur
ec8bd6327d
Fix css
2019-11-04 18:53:46 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-04 18:52:29 +01:00
Laurent Destailleur
6e591d2be0
Fix css
2019-11-04 18:25:32 +01:00
Laurent Destailleur
4ca85eacc1
Debug module BOM
2019-11-04 15:45:50 +01:00
Laurent Destailleur
11500fb8d9
FIX confusion between permto... and permisstionto...
2019-11-04 15:33:49 +01:00
Laurent Destailleur
b0ea276233
Debug MO module
2019-11-04 14:13:36 +01:00
Laurent Destailleur
1f6a86e166
Fix look and feel v11
2019-11-04 13:32:34 +01:00
Laurent Destailleur
8aa2fd04ad
NEW The integrity checker now show the expected size of files
2019-11-04 13:23:48 +01:00
Laurent Destailleur
d934f5e920
Fix wrap
2019-11-04 11:44:46 +01:00
Laurent Destailleur
abc6f6ccae
Fix css
2019-11-04 11:43:07 +01:00
Laurent Destailleur
5497e1e103
css
2019-11-04 11:42:27 +01:00
Laurent Destailleur
666e60a883
Responsive
2019-11-04 11:40:54 +01:00
Laurent Destailleur
1053112843
css
2019-11-04 11:07:08 +01:00
Laurent Destailleur
ed3f95b4a6
Responsive
2019-11-04 10:55:08 +01:00
Frédéric FRANCE
60198190fc
Update box_propales.php
2019-11-03 23:55:04 +01:00
Frédéric FRANCE
317ba9c047
Merge remote-tracking branch 'upstream/develop' into escpos
2019-11-03 23:49:36 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-11-03 21:48:24 +01:00
Frédéric FRANCE
877f40a1c8
price
2019-11-03 20:07:11 +01:00
Laurent Destailleur
99a4781a42
Fix better support for multicurrency for template invoices
2019-11-03 18:58:26 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module
2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module
2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer
2019-11-02 21:15:48 +01:00
Frédéric FRANCE
3e2d89dc02
Update ticket.lib.php
2019-11-02 18:16:09 +01:00
Laurent Destailleur
2ee002fc80
Fix trans
2019-11-02 17:44:58 +01:00
Laurent Destailleur
6f82c212a0
Finished migration to the new architecture of extrafields
2019-11-02 17:38:19 +01:00
Laurent Destailleur
89f1904793
Finish removing of ->attribute_label
2019-11-02 17:26:26 +01:00
Laurent Destailleur
496f93911f
Merge pull request #11821 from Tim-Otte/develop
...
NEW Extrafields support in product supplier prices
2019-11-02 16:19:13 +01:00
Laurent Destailleur
df750b6a9d
Merge pull request #12287 from TobiasSekan/AddAttendeeToIcal
...
NEW Add attendee to ical export + cleanup
2019-11-02 13:40:27 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
...
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
04a5054e1c
Merge pull request #12279 from atm-john/develop_ticket_file_display
...
New - ticket file download button display
2019-11-02 13:32:33 +01:00
Laurent Destailleur
906f30773d
Merge pull request #12269 from atm-ph/new_edit_comment
...
New update comments is now available
2019-11-02 13:09:21 +01:00
Laurent Destailleur
d232b7a387
Merge pull request #12286 from grandoc/new_branch_01_11_2019
...
add some comment
2019-11-02 13:00:23 +01:00
Laurent Destailleur
58ffb73627
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid
2019-11-02 12:01:06 +01:00
Laurent Destailleur
c12e66e2a2
Merge branch 'develop' into new_branch_01_11_2019
2019-11-02 12:00:04 +01:00
stickler-ci
b43d06db37
Fixing style errors.
2019-11-02 10:55:24 +00:00
Laurent Destailleur
37f4ebb1b2
Update xcal.lib.php
2019-11-02 11:56:01 +01:00
Laurent Destailleur
68691ddd8a
Merge pull request #12265 from grandoc/new_branch_30_10_2019
...
add comment
2019-11-02 11:49:28 +01:00
Laurent Destailleur
d9f333d828
Merge pull request #12289 from frederic34/datetime
...
php is > 5.4
2019-11-02 11:46:34 +01:00
Laurent Destailleur
23d238c16d
Merge pull request #12291 from frederic34/patch-15
...
give a value by default
2019-11-02 11:43:02 +01:00
Laurent Destailleur
f9031cdbfd
Clean code
2019-11-02 11:36:48 +01:00
Laurent Destailleur
68c971a2b5
All properties 'type_libelle' were renamed into 'type_label'.
2019-11-02 11:12:57 +01:00
Frédéric FRANCE
77d4ca81dc
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-02 09:14:15 +01:00
Laurent Destailleur
cea2c3a9f4
Look and feel v11
2019-11-01 23:58:14 +01:00
Laurent Destailleur
8608c5db9c
Fix color of task progression
2019-11-01 23:16:08 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid
2019-11-01 21:39:20 +01:00
Laurent Destailleur
f74833cfe1
Make modulebuilder more compatible with multicompany
2019-11-01 18:44:32 +01:00
Laurent Destailleur
012c5ef0c4
Can use substitution variables into filter of fields link
2019-11-01 18:35:48 +01:00
Laurent Destailleur
2af23aa658
Enhance modulebuilder
2019-11-01 17:54:17 +01:00
Laurent Destailleur
a1b2130247
Enhance the progress bar of tasks
2019-11-01 16:09:31 +01:00
Frédéric FRANCE
18b662e430
Update box_graph_orders_permonth.php
2019-11-01 16:01:08 +01:00
Frédéric FRANCE
d14015e3df
Update box_graph_invoices_permonth.php
2019-11-01 15:59:17 +01:00
Frédéric FRANCE
dab8aabb16
Update box_graph_invoices_supplier_permonth.php
2019-11-01 15:58:30 +01:00
Frédéric FRANCE
93b00038f8
Update box_graph_orders_supplier_permonth.php
2019-11-01 15:57:40 +01:00
Frédéric FRANCE
5bdb9da5c5
Update box_graph_invoices_supplier_permonth.php
2019-11-01 15:56:15 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Frédéric FRANCE
931f2b809d
Update box_graph_orders_permonth.php
2019-11-01 15:52:13 +01:00
Frédéric FRANCE
44c8cd9d23
give a value by default
...
The variable $fileurlnb does not seem to be defined for all execution paths
2019-11-01 15:48:55 +01:00
Frédéric FRANCE
da238e94e1
php is > 5.4
2019-11-01 15:21:21 +01:00
Sekan, Tobias
e27f1c623d
Merge branch 'AddAttendeeToIcal' of https://github.com/TobiasSekan/dolibarr into develop
2019-11-01 13:16:54 +01:00
Sekan, Tobias
885c6e6516
Fix wrong newline replacement
2019-11-01 13:16:14 +01:00
Laurent Destailleur
e3b5be7475
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
...
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
2019-11-01 12:52:03 +01:00
stickler-ci
fee0a362ad
Fixing style errors.
2019-11-01 11:11:59 +00:00
Sekan, Tobias
2a983a6a7c
fix link in documentation
2019-11-01 12:09:43 +01:00
Sekan, Tobias
0bfff92032
Add attendee to ical export + cleanup
2019-11-01 11:59:54 +01:00
Philippe Grand
db9c490470
Update emailsenderprofile.class.php
2019-11-01 11:18:54 +01:00
Philippe Grand
74ae90f9da
Update commonobject.class.php
2019-11-01 11:18:12 +01:00
stickler-ci
0c6938aa2a
Fixing style errors.
2019-11-01 09:44:29 +00:00
Philippe GRAND
4fe3e49502
add some comment
2019-11-01 10:42:14 +01:00
Laurent Destailleur
5b5a2e9804
Clean code
2019-11-01 03:25:09 +01:00
Laurent Destailleur
aa306bf5d4
Debug widgets
2019-10-31 23:50:36 +01:00
Laurent Destailleur
b8803fa8df
Work on MO
2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531
Work on MO
2019-10-31 22:46:34 +01:00
Laurent Destailleur
af09c77a0c
Fix phpcs
2019-10-31 22:15:18 +01:00
Laurent Destailleur
c215d534fc
Fix phpcs
2019-10-31 21:16:41 +01:00
Laurent Destailleur
f98df3c807
NEW Can edit link to the translation page in website module
2019-10-31 21:09:33 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid
2019-10-31 20:46:31 +01:00
Laurent Destailleur
dcbe7fe8da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-31 14:06:36 +01:00
Laurent Destailleur
360b3a9550
NEW Ask the new label and new dates in confirm popup when cloning tax
2019-10-31 14:06:26 +01:00
stickler-ci
8765e7648e
Fixing style errors.
2019-10-31 11:03:46 +00:00
atm-ph
526aeab9af
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_search_input_on_type_list
2019-10-31 12:02:53 +01:00
John Botella
d0a5e30faa
Change btn name
2019-10-31 08:44:08 +01:00
Laurent Destailleur
b296f62671
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
2019-10-31 02:36:31 +01:00
Laurent Destailleur
645390c990
Work on BOM templates
2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-30 20:06:43 +01:00
John Botella
0cff122ccd
Add file display in ticket
2019-10-30 17:46:18 +01:00
atm-ph
2f68a73a2a
New update comments is now available
2019-10-30 15:45:04 +01:00
Marc de Lima Lucio
85cef09e83
FIX: triggers: directories read with opendir() never closed
2019-10-30 14:46:46 +01:00
stickler-ci
ed9a136211
Fixing style errors.
2019-10-30 08:58:19 +00:00
Philippe GRAND
445d09cf8a
add comment
2019-10-30 09:50:06 +01:00
Philippe GRAND
a80243e528
add comment
2019-10-30 09:48:34 +01:00
Laurent Destailleur
6a01132fdb
Merge pull request #12210 from grandoc/new_branch_24_10_2019
...
add some comment
2019-10-30 03:17:21 +01:00
Laurent Destailleur
2770f79a86
Merge pull request #12216 from frederic34/patch-5
...
css
2019-10-30 03:02:24 +01:00
Laurent Destailleur
66a288a343
Merge pull request #12235 from frederic34/scopeindent
...
clean indent
2019-10-30 02:57:59 +01:00
Laurent Destailleur
05fdddd15e
Merge pull request #12240 from frederic34/patch-19
...
Update html.formmail.class.php
2019-10-30 02:57:27 +01:00
Laurent Destailleur
248016cd5d
Merge pull request #12241 from frederic34/contactphone
...
Contactphone
2019-10-30 02:52:11 +01:00
Laurent Destailleur
bf0400a29b
Merge pull request #12252 from oscim/patch-10
...
Update admin.lib.php
2019-10-30 02:41:59 +01:00
Laurent Destailleur
f03bf149bd
Fix autoselect of field with modulebuilder
2019-10-30 02:09:29 +01:00
Laurent Destailleur
bc3f088f50
Enhance modulebuilder
...
Work on MO
2019-10-30 01:35:41 +01:00
Laurent Destailleur
beb85ee3a8
Work on MO
2019-10-30 00:56:57 +01:00
Laurent Destailleur
66337ec234
NEW Add widgets for BOMs and MOs
2019-10-30 00:36:47 +01:00
Laurent Destailleur
4eedf4a113
Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop
2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stock/replenishorders.php
2019-10-29 11:48:11 +01:00
Laurent Destailleur
e58ecaaa64
Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0
...
Conflicts:
htdocs/product/stock/replenishorders.php
2019-10-29 11:43:35 +01:00
stickler-ci
52ef2bb990
Fixing style errors.
2019-10-29 10:16:49 +00:00
oscim
d310ca6e82
Update admin.lib.php
...
add function modulehelp_prepare_head
2019-10-29 11:15:03 +01:00
Laurent Destailleur
5e06fe0712
FIX Avoid fatal error when creating thumb from PDF
2019-10-29 11:11:13 +01:00
Frédéric FRANCE
043a71442f
contact phone
2019-10-27 20:06:16 +01:00
Frédéric FRANCE
a9447bc963
Update html.formmail.class.php
2019-10-27 18:08:21 +01:00
Frédéric FRANCE
1ba9612f12
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-27 17:03:50 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent
2019-10-27 17:01:23 +01:00
Laurent Destailleur
afa3ed499f
Can export BOMs
2019-10-27 15:56:20 +01:00
Frédéric FRANCE
e2afcfb999
clean indent
2019-10-27 11:53:20 +01:00
Frédéric FRANCE
e203f87c84
clean indent
2019-10-27 11:18:36 +01:00
Laurent Destailleur
5cb9434bb4
FIX Stock qty hidden without permission to see stock
2019-10-27 00:55:06 +02:00
Laurent Destailleur
e17cc5b2e5
Debug cloning of BOMs
2019-10-27 00:26:11 +02:00
Laurent Destailleur
f060ef1018
FIX Clean decimal data for module builder
2019-10-27 00:01:16 +02:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-25 08:12:54 +02:00
Frédéric FRANCE
83ed70f72f
Update agenda.lib.php
2019-10-24 22:44:51 +02:00
Laurent Destailleur
2814a5c07b
Fix phpcs
2019-10-24 21:47:31 +02:00
Laurent Destailleur
b45ee20696
NEW Add a tab to setup "Opening hours" of company (information only)
2019-10-24 21:29:07 +02:00
Laurent Destailleur
8d21144521
Beautify select of products in vendor record
2019-10-24 20:33:16 +02:00
Philippe GRAND
5e44d63ec0
Merge remote-tracking branch 'upstream/develop' into new_branch_24_10_2019
2019-10-24 16:24:17 +02:00
Laurent Destailleur
88e848e346
FIX Extrafields missing in export of expense report
2019-10-24 16:00:10 +02:00
Laurent Destailleur
15609e319f
FIX Extrafields missing in export of expense report
2019-10-24 15:57:34 +02:00
Philippe GRAND
ac839204d7
add some comment
2019-10-24 15:12:20 +02:00
Philippe GRAND
ffa5c8cbc0
add some comment
2019-10-24 15:10:05 +02:00
stickler-ci
3fb0b1ac73
Fixing style errors.
2019-10-24 13:07:19 +00:00
Philippe GRAND
480e21b88a
add some comment
2019-10-24 15:06:56 +02:00
stickler-ci
9eb0385a88
Fixing style errors.
2019-10-24 13:02:34 +00:00
Philippe GRAND
f1db8e6f03
add some comment
2019-10-24 15:02:37 +02:00
stickler-ci
8a7360dd32
Fixing style errors.
2019-10-24 12:59:20 +00:00
Philippe GRAND
96ab43d495
add some comment
2019-10-24 14:58:15 +02:00
Laurent Destailleur
7297514afb
NEW Use the gender of member for picto in member lists.
2019-10-23 21:00:29 +02:00
Laurent Destailleur
fd04729727
Fix tooltip on extrafield title was on wrong line.
2019-10-23 20:35:39 +02:00
Laurent Destailleur
b48f08dd07
Theme v11
2019-10-23 20:12:29 +02:00
Laurent Destailleur
41303006f3
Rename constant
2019-10-23 17:48:55 +02:00
Laurent Destailleur
f4545a2068
Debug method MAIN_STATUS_USES_CSS
2019-10-23 17:31:54 +02:00
Laurent Destailleur
a8ca8c7a1f
Fix edit of extrafields link when empty
2019-10-23 16:38:15 +02:00
Laurent Destailleur
9a386da7f5
NEW Can crop/resize image attached on a bank record
2019-10-23 16:07:09 +02:00
Laurent Destailleur
da00591bba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/product.lib.php
htdocs/expedition/card.php
htdocs/product/list.php
2019-10-23 04:04:32 +02:00
Laurent Destailleur
161f2a018f
Fix responsive and bad closing td
2019-10-23 03:50:48 +02:00
Laurent Destailleur
f23804a091
FIX #12152
2019-10-23 03:00:19 +02:00
Laurent Destailleur
fea12076ee
FIX #12152
2019-10-22 20:24:52 +02:00
Laurent Destailleur
c4be61c55c
FIX Better compatible fix for the trouble of weight / size units
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/product/card.php
2019-10-22 18:42:59 +02:00
Laurent Destailleur
e7e9898e0d
FIX Better compatible fix for the trouble of weight / size units
2019-10-22 18:36:36 +02:00
Laurent Destailleur
b88968520b
Move code of extrafields to the new architecture
2019-10-22 17:08:37 +02:00
Laurent Destailleur
8242281ef8
Close #12096
2019-10-22 14:39:33 +02:00
Laurent Destailleur
5ad7ca5620
Code more generic around setting projet on a card
2019-10-22 13:43:24 +02:00
Laurent Destailleur
b2bbee55f1
Fix phpcs
2019-10-22 12:37:36 +02:00
Laurent Destailleur
2eb5803644
Merge pull request #12196 from bb2a/patch-2
...
Update functions.lib.php
2019-10-22 12:36:47 +02:00
Laurent Destailleur
9be9f912af
Merge pull request #12192 from Ahuahuachi/develop
...
Translate documentation and minor code improvement
2019-10-22 12:32:40 +02:00
Laurent Destailleur
e5ee83ead1
Merge pull request #12194 from grandoc/new_branch_21_10_2019
...
internationalization
2019-10-22 12:31:48 +02:00
Tim Otte
ad51e862e4
Merged
2019-10-22 11:39:32 +02:00
Tim Otte
ceb3482204
Requested changes implemented
2019-10-22 11:36:28 +02:00
Laurent Destailleur
aa4afcfe8a
NEW Can set a filter on object linked in modulebuilder.
2019-10-22 03:49:09 +02:00
Laurent Destailleur
6aa2ceac1a
Fix phpcs
2019-10-22 02:53:29 +02:00
Anthony Berton
5e7d615250
Update functions.lib.php
2019-10-21 21:06:48 +02:00
Laurent Destailleur
8e474701c1
Fix missing token
2019-10-21 15:49:08 +02:00
Laurent Destailleur
e261d63295
NEW Can add a button "Create" after combo of object with modulebuilder.
2019-10-21 14:44:39 +02:00
Laurent Destailleur
3024919cd6
fix phpcs
2019-10-21 10:25:23 +02:00
Philippe GRAND
a0303e903a
internationalization
2019-10-21 09:53:42 +02:00
Philippe GRAND
db22cdb8ea
internationalization
2019-10-21 09:43:34 +02:00
Laurent Destailleur
6e9f3c3f9d
Merge pull request #11084 from atm-florian/dev_MassSendEmailInvoiceToBillingContact
...
NEW : mass email action on invoice list use billing contact if exists
2019-10-20 21:45:37 +02:00
Laurent Destailleur
528ded58cf
Merge pull request #12187 from c3do/develop
...
NEW Add API to get Country by code and iso
2019-10-20 21:26:44 +02:00
Alfredo Altamirano
d921b08e5c
Translate documentation of translate class
2019-10-20 11:44:07 -05:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Frédéric FRANCE
0ede817588
do not ignore lines with mix od tabs and spaces
2019-10-20 16:56:47 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-20 16:37:18 +02:00
Laurent Destailleur
5a4960f7ae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
c3do
4fb0d03500
NEW Add API to get Country by code and iso
2019-10-20 15:25:18 +02:00
Laurent Destailleur
49c101bb77
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-20 15:16:51 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
8ce6197314
Update commondocgenerator.class.php
2019-10-20 14:37:15 +02:00
Laurent Destailleur
1b3d6d749a
Merge pull request #12175 from Shnoulle/develop
...
Close #12098 : allow usage of AUTH LOGIN in smtp
2019-10-20 13:48:24 +02:00
Laurent Destailleur
e95861c361
Update smtps.class.php
2019-10-20 13:48:01 +02:00
Laurent Destailleur
3b5e62947d
Update smtps.class.php
2019-10-20 13:44:28 +02:00
Laurent Destailleur
84f6fd64a9
Merge pull request #12176 from Ahuahuachi/develop
...
Translation of some function documentation
2019-10-20 13:31:25 +02:00
Laurent Destailleur
9e7476cd1f
Merge pull request #12171 from grandoc/new_branch_18_10_2019
...
Standardization
2019-10-20 13:30:40 +02:00
Laurent Destailleur
62a8523ccf
Merge pull request #12178 from frederic34/patch-18
...
Update functions2.lib.php
2019-10-20 12:40:34 +02:00
Laurent Destailleur
ff30274a59
Merge pull request #12177 from frederic34/patch-17
...
Update box_produits.php
2019-10-20 12:40:10 +02:00
stickler-ci
66a2dc4994
Fixing style errors.
2019-10-20 09:18:55 +00:00
Frédéric FRANCE
33c35780e0
wip
2019-10-20 11:17:54 +02:00
Frédéric FRANCE
360bf55f5b
clean indent
2019-10-20 01:09:11 +02:00
Alfredo Altamirano
9d9961e936
Translate documentation
2019-10-19 16:55:27 -05:00
Alfredo Altamirano
1ede09c21a
Fix typo
2019-10-19 11:17:53 -05:00
Frédéric FRANCE
f0a3d1a1c4
Update functions2.lib.php
2019-10-18 23:20:34 +02:00
Frédéric FRANCE
486047c357
Update box_produits.php
2019-10-18 23:14:43 +02:00
Alfredo Altamirano
71f9b4f36b
Translation of parameter documentation
2019-10-18 12:55:21 -05:00
Denis Chenu
88100a53aa
Close #12098 : allow usage of AUTH LOGIN in smtp
...
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
2019-10-18 17:35:52 +02:00
Laurent Destailleur
becd3f7d2f
FIX Missing status and paid flag in export or expense report
2019-10-18 15:35:25 +02:00
Philippe GRAND
a07ab341f8
Standardization
2019-10-18 13:00:31 +02:00
Philippe GRAND
41d2cb2c29
Standardization
2019-10-18 12:56:40 +02:00
Philippe GRAND
f43d51bfec
Standardization
2019-10-18 12:51:49 +02:00
Philippe GRAND
731f4587e2
Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019
2019-10-18 12:44:40 +02:00
Philippe GRAND
18b183f516
Standardization
2019-10-18 12:43:25 +02:00
stickler-ci
0c61e798a6
Fixing style errors.
2019-10-18 09:42:15 +00:00
Philippe GRAND
3b56d91727
Standardization
2019-10-18 11:41:18 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3
Clean code for order of modules
2019-10-17 19:21:30 +02:00
Laurent Destailleur
87ec1de78e
Start to work on solution to sort permissions by module
2019-10-17 18:43:07 +02:00
Laurent Destailleur
40fdcfac7e
Merge branch 'develop' into 10.0_closure2
2019-10-17 18:16:57 +02:00
Laurent Destailleur
4d9c285126
Merge pull request #12163 from sadlig/fix-stock-movement-right
...
Fix Stock movement user's right (Fixes #11967 )
2019-10-17 17:53:17 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
...
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-17 17:48:42 +02:00
Laurent Destailleur
25fe861f9b
Merge pull request #12151 from tuxgasy/10_Product_import_duplicate_volumUnits
...
Fix width unit label in product import
2019-10-17 17:47:31 +02:00
Laurent Destailleur
f71423b3fd
Merge pull request #12160 from grandoc/new_branch_17_10_2019
...
Internationalization
2019-10-17 17:42:44 +02:00
Laurent Destailleur
c64a537bfd
Merge pull request #12155 from frederic34/patch-14
...
Update html.formticket.class.php
2019-10-17 17:42:30 +02:00
Laurent Destailleur
9397407f23
Merge pull request #12149 from grandoc/new_branch_16_10_2019
...
internationalization
2019-10-17 17:41:51 +02:00
Laurent Destailleur
40a9b95696
Merge pull request #12148 from homer8173/patch-7
...
use current local time on Now button
2019-10-17 17:41:16 +02:00
Gildas
132ea56a59
Fix Stock movement user's right ( Fixes #11967 )
2019-10-17 17:06:38 +02:00
Philippe GRAND
2efeeb0ad8
Internationalization
2019-10-17 14:47:03 +02:00
Laurent Destailleur
084ab53b4b
Fix translation
2019-10-17 12:14:38 +02:00
Frédéric FRANCE
46d2bf3317
Update html.formticket.class.php
2019-10-16 23:18:14 +02:00
Frédéric FRANCE
219a4b4374
Update html.formticket.class.php
2019-10-16 23:08:04 +02:00
Frédéric FRANCE
701afc99e9
Update html.formticket.class.php
2019-10-16 23:03:59 +02:00
Frédéric FRANCE
4bc0a6db2d
Update html.formticket.class.php
2019-10-16 22:56:29 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
8a7a0b80e2
Fix remove warnings
2019-10-16 19:08:31 +02:00
Laurent Destailleur
41dd53170e
Code comment
2019-10-16 19:07:17 +02:00
Laurent Destailleur
205967976c
Can set a BOM to draft
2019-10-16 18:35:15 +02:00
TuxGasy
43ce1543d8
Fix width unit label in product import
2019-10-16 17:37:20 +02:00
Laurent Destailleur
7960c91955
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/theme/md/style.css.php
2019-10-16 17:27:41 +02:00
Laurent Destailleur
8152c60878
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
2019-10-16 17:13:14 +02:00
Laurent Destailleur
b47ebcca2b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-16 17:10:10 +02:00
Philippe GRAND
10fd472392
internationalization
2019-10-16 15:59:08 +02:00
Philippe GRAND
cd825ba4be
internationalization
2019-10-16 15:46:46 +02:00
stickler-ci
fce1f1991c
Fixing style errors.
2019-10-16 12:34:42 +00:00
Norbert Penel
8d75e83e55
use current local time on Now button
...
use current local time for feed the date according to locale settings
2019-10-16 14:32:17 +02:00
Laurent Destailleur
7a927a22e3
Merge pull request #12137 from frederic34/patch-15
...
Update box_task.php
2019-10-16 14:31:01 +02:00
Laurent Destailleur
2aa594de9d
Merge pull request #12124 from c3do/patch-1
...
New: Set a pricing rule by default for new clean installation
2019-10-16 13:25:44 +02:00
Laurent Destailleur
d7871c4971
Merge pull request #12132 from grandoc/new_branch_15_10_2019
...
Internationalization
2019-10-16 13:24:10 +02:00
Laurent Destailleur
ea2986037f
Merge pull request #12147 from homer8173/patch-5
...
Fix user time instead of server time
2019-10-16 13:12:37 +02:00
Laurent Destailleur
1d7efbdc64
Merge pull request #12138 from frederic34/patch-16
...
FIX datec in box ticket
2019-10-16 13:02:59 +02:00
stickler-ci
bba042c0c3
Fixing style errors.
2019-10-16 10:34:47 +00:00
Norbert Penel
8d49609549
Fix user time instead of server time
...
it seems that we want to use a user time by clicking on now button.
IDEA : may i use client time ??? because if page is old, the now button insert an old time.
2019-10-16 12:28:50 +02:00
Laurent Destailleur
6d05d42c50
Look and feel v11
2019-10-16 11:26:20 +02:00
Laurent Destailleur
e07e01580d
Replace deprecated code with new one
2019-10-16 03:34:32 +02:00
Laurent Destailleur
b0de030f3e
phpcs
2019-10-16 02:05:47 +02:00
Laurent Destailleur
ffc4820970
Fix counter of BOM
2019-10-16 02:05:23 +02:00
Laurent Destailleur
d3df04c5aa
Mutualize code
2019-10-16 01:36:07 +02:00
Laurent Destailleur
b0355dd149
Module BOM have now status DRAFT, VALIDATED, DISABLED
2019-10-16 01:20:58 +02:00
Laurent Destailleur
9ce71c26aa
Use alpha logo by default
2019-10-15 11:41:22 +02:00
Laurent Destailleur
63a60c7811
NEW Add option MAIN_PDF_FORCE_FONT_SIZE
2019-10-15 11:13:14 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-15 09:39:57 +02:00
Laurent Destailleur
fb3d20107c
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/exports/export.php
htdocs/filefunc.inc.php
2019-10-15 03:51:57 +02:00
Laurent Destailleur
2ed96c9e5f
Fix scrutinizer
2019-10-15 02:54:19 +02:00
Laurent Destailleur
a1c93cb2e6
MAIN_ACTIVATE_HTML5 is now always on now (so option removed).
...
Look and feel v11
2019-10-15 02:45:12 +02:00
Laurent Destailleur
f50a75194c
Removed warning
2019-10-15 00:44:22 +02:00
Frédéric FRANCE
194072fc60
Update box_last_ticket.php
2019-10-15 00:14:43 +02:00
Frédéric FRANCE
a53c7cfca8
Update box_last_modified_ticket.php
2019-10-15 00:13:52 +02:00
Laurent Destailleur
c869cbe193
Merge pull request #11995 from atm-john/develop_unlock_title_button_feature
...
Unlock title button feature
2019-10-14 23:55:10 +02:00
Laurent Destailleur
2d1bc90e57
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2019-10-14 23:50:06 +02:00
Frédéric FRANCE
b77d2f2ff2
Update box_task.php
2019-10-14 23:27:37 +02:00
stickler-ci
30099a821b
Fixing style errors.
2019-10-14 19:39:00 +00:00
Philippe GRAND
6761e1ef33
Internationalization
2019-10-14 21:38:21 +02:00
Philippe GRAND
7ce5ddbf02
Internationalization
2019-10-14 21:25:43 +02:00
Laurent Destailleur
07bb83a96d
Merge pull request #12113 from aspangaro/10.0_p25
...
Remove a duplicate line
2019-10-14 21:04:22 +02:00
Laurent Destailleur
b8a27a47aa
Merge pull request #12112 from frederic34/patch-17
...
Update box_last_modified_ticket.php
2019-10-14 20:57:18 +02:00
Laurent Destailleur
1fc5afa022
Merge pull request #12111 from frederic34/patch-16
...
Update box_last_ticket.php
2019-10-14 20:56:25 +02:00
Laurent Destailleur
7b1b51e752
Merge pull request #12115 from TobiasSekan/develop
...
Fix MS Outlook import error
2019-10-14 20:54:30 +02:00
Laurent Destailleur
4941a99cc7
Merge pull request #12126 from grandoc/new_branch_14_10_2019
...
add missing translation
2019-10-14 20:53:28 +02:00
Laurent Destailleur
5a55997540
Update pdf_eratosthene.modules.php
2019-10-14 20:53:18 +02:00
Laurent Destailleur
2f0bf491ac
Merge pull request #12130 from frederic34/patch-19
...
Update check_notifications.php
2019-10-14 20:38:40 +02:00
Laurent Destailleur
5c4edad0d4
Merge pull request #12105 from grandoc/new_branch_12_10_2019
...
more internationalization
2019-10-14 20:37:50 +02:00
Frédéric FRANCE
502d154cea
Update check_notifications.php
2019-10-14 20:01:35 +02:00
Laurent Destailleur
3b84e2bac3
Use img-thumb css
2019-10-14 19:21:13 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-14 19:02:46 +02:00
Philippe GRAND
fd90ebe63b
add missing translation
2019-10-14 15:57:29 +02:00
Philippe GRAND
e326c23245
add missing translation
2019-10-14 15:48:24 +02:00
Cédric
44476afdac
FIX: No pricing rule on new clean installation
...
There is no pricing rule on new fresh installation of Dolibarr.
I think the pricing rule "PRODUCT_PRICE_UNIQ" should be set by default because it is needed to update a product through API REST.
2019-10-14 15:35:04 +02:00
Laurent Destailleur
a33fb47777
Work on MO module
2019-10-14 12:10:14 +02:00
Laurent Destailleur
7973b03201
NEW Add estimated duration on the BOM module
2019-10-14 11:38:36 +02:00
Tobias Sekan
e2ca646b6e
Fix MS Outlook import error
2019-10-14 10:22:47 +02:00
Alexandre SPANGARO
e50d32dc00
Remove a duplicate line
2019-10-13 13:20:45 +02:00
Frédéric FRANCE
92e4b962fa
Update box_last_modified_ticket.php
2019-10-13 10:37:30 +02:00
Frédéric FRANCE
67278e4781
Update box_last_ticket.php
2019-10-13 10:18:41 +02:00
Alexandre SPANGARO
499eb87173
lang file for holidays is holiday
2019-10-13 08:20:37 +02:00
Frédéric FRANCE
c143584af4
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 21:16:54 +02:00
Laurent Destailleur
c338db6c36
Fix unlink picto
2019-10-12 19:16:36 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-12 19:02:24 +02:00
Laurent Destailleur
9ba992b8b6
Work on inventory module
2019-10-12 12:31:35 +02:00
Philippe GRAND
33efd77fc7
more internationalization
2019-10-12 12:10:33 +02:00
Frédéric FRANCE
9f59656589
fix typo inspired by grandoc
2019-10-11 23:08:33 +02:00
Laurent Destailleur
2fa3b23cf1
Fix missing price level field
2019-10-11 19:36:36 +02:00
Laurent Destailleur
f334180cb8
Merge pull request #12072 from OPEN-DSI/new-categorie-import-parent
...
NEW add parent category id or label in import category module
2019-10-11 17:33:28 +02:00
Laurent Destailleur
fa928f7dc3
Update modCategorie.class.php
2019-10-11 17:33:13 +02:00
Laurent Destailleur
95305a313d
Fix trans
2019-10-11 17:02:35 +02:00
Laurent Destailleur
60bdb3133e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-11 16:57:56 +02:00
Laurent Destailleur
b58c2c38b2
Fix missing token
2019-10-11 16:57:47 +02:00
Laurent Destailleur
3f62a6d532
Merge pull request #12093 from frederic34/patch-23
...
fix search by roles
2019-10-11 16:57:33 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-11 16:44:25 +02:00
Laurent Destailleur
cc73877e03
Merge branch 'develop' into patch-18
2019-10-11 16:32:48 +02:00
Laurent Destailleur
541357027e
Merge pull request #12077 from frederic34/patch-15
...
globe fontawesome
2019-10-11 16:31:37 +02:00
Laurent Destailleur
d6881f9192
Merge pull request #12095 from atm-john/develop_fix_logo_bg
...
Fix logo container css name and add hidden conf to remove background
2019-10-11 16:25:48 +02:00
Laurent Destailleur
a0f918c85a
Merge pull request #12094 from grandoc/new_branch_11_10_2019
...
fix some translations
2019-10-11 16:21:06 +02:00
Laurent Destailleur
dbb06adf98
Merge pull request #12090 from frederic34/patch-19
...
doxygen
2019-10-11 16:15:36 +02:00
Laurent Destailleur
78bfc8997d
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:14:29 +02:00
Laurent Destailleur
d052e4f323
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:13:26 +02:00
Laurent Destailleur
fc9c343af9
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/class/link.class.php
2019-10-11 16:12:01 +02:00
Laurent Destailleur
114e741975
Merge pull request #12079 from frederic34/patch-17
...
Update box_factures_imp.php
2019-10-11 15:54:37 +02:00
Laurent Destailleur
c6a796d270
Try to fix #12097
2019-10-11 15:45:32 +02:00
Laurent Destailleur
868bfb518b
FIX #11702 FIX #12088
2019-10-11 15:08:10 +02:00
Laurent Destailleur
7ce01c5ceb
Look and feel v11
2019-10-11 14:42:55 +02:00
John Botella
1fdc38da2f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_fix_logo_bg
2019-10-11 14:36:48 +02:00
Laurent Destailleur
c21224ef96
Align code of auguria menu handler with new architecture
2019-10-11 14:24:47 +02:00
Laurent Destailleur
9251f04d63
Update thumbs of themes
2019-10-11 13:26:48 +02:00
Laurent Destailleur
5801d09dbe
NEW Use the squarre logo as favicon of pages
2019-10-11 12:28:13 +02:00
VESSILLER
2fb776ee34
NEW add new rule fetchidfromcodeandlabel for categories import
2019-10-11 11:57:11 +02:00
Philippe GRAND
25b9be9de7
update code
2019-10-11 10:19:58 +02:00
Philippe Grand
bcb7365a5a
Update commondocgenerator.class.php
2019-10-11 10:13:21 +02:00
John Botella
4873cbd071
Fix css name
2019-10-11 10:10:12 +02:00
John Botella
13115a55a2
Fix logo background and hidden conf
2019-10-11 10:02:59 +02:00
Philippe GRAND
af88f44fd9
fix some translations
2019-10-11 09:51:17 +02:00
John Botella
9194eb4bec
Fix block title height if no button
2019-10-11 09:14:10 +02:00
John Botella
724999f1ce
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
2019-10-11 08:40:43 +02:00
Frédéric FRANCE
c80d055af3
fix search by roles
2019-10-10 23:51:54 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-10 23:24:50 +02:00
Laurent Destailleur
e7f56b67d8
Look and feel v11
2019-10-10 23:00:33 +02:00
Frédéric FRANCE
9a2fabff6f
doxygen
2019-10-10 18:42:29 +02:00
Laurent Destailleur
a8676e63c8
CSS
2019-10-10 16:46:50 +02:00
Laurent Destailleur
e2113c2f33
Fix sort lost after uploading a file
2019-10-10 16:41:24 +02:00
Laurent Destailleur
b34cbfad74
Rename const
2019-10-10 15:23:45 +02:00
Laurent Destailleur
d9a0dc2986
Fix trans
2019-10-10 15:20:44 +02:00
Laurent Destailleur
aebae5ff83
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/margins.lang
htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Frédéric FRANCE
be00576717
Update functions.lib.php
2019-10-10 08:22:14 +02:00
Frédéric FRANCE
90257dc087
Update box_factures_imp.php
2019-10-10 08:09:39 +02:00
Frédéric FRANCE
d4757a0b5b
globe fontawesome
2019-10-09 23:20:15 +02:00
Laurent Destailleur
072a0a26d6
Use a font awesome icon to show "shippable" flag on orders.
2019-10-09 18:07:00 +02:00
Laurent Destailleur
db651a607d
Use fontawesome for img_warning
2019-10-09 17:33:46 +02:00
VESSILLER
d77f7556d8
NEW add parent category id or label in import category module
2019-10-09 16:00:14 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-09 13:40:46 +02:00
Laurent Destailleur
f2d04fe55c
Code comment
2019-10-09 11:51:10 +02:00
Laurent Destailleur
9f4aadae18
Missing Nature, Duration and Type fields in export of products
2019-10-09 02:05:20 +02:00
Frédéric FRANCE
5ac8ba8c65
fix travis
2019-10-08 22:13:19 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 18:30:58 +02:00
Laurent Destailleur
f55a4d77e4
css
2019-10-08 16:41:03 +02:00
stickler-ci
7e841350db
Fixing style errors.
2019-10-08 13:24:41 +00:00
Laurent Destailleur
138ac0d524
Merge pull request #12063 from laudeco/feature/export_user_bank_account
...
NEW Add bank data of user into the expense report exports
2019-10-08 15:19:46 +02:00
Laurent Destailleur
06eedece26
Merge pull request #11371 from bafbes/abb90058
...
New:Show labels of countries in modulebuilder
2019-10-08 15:17:16 +02:00
Laurent Destailleur
c724eef85c
Update ccountry.class.php
2019-10-08 15:16:56 +02:00
Laurent Destailleur
bd867f5e80
Update ccountry.class.php
2019-10-08 15:16:23 +02:00
Laurent Destailleur
651dec8dc2
Doxygen
2019-10-08 11:27:52 +02:00
Laurent Destailleur
43a70e5548
Clean code to use the new $extrafields->attributes array
2019-10-08 09:28:50 +02:00
Laurent Destailleur
d55b7689bb
Merge pull request #11920 from ptibogxiv/patch-264
...
NEW translation for member type
2019-10-08 09:00:49 +02:00
Laurent De Coninck
c8fb1e852c
export some other fields on the expense reports
...
When the user requests the export of the expense reports, some fields
were missing such as the bank account information of the user.
This PR adds the support of all those fields on the expense report
export. Now when you export the expense report you have :
* The bank name
* The bank code
* The IBAN
* The BIC
* The owner
* The owner address
2019-10-08 08:51:09 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-08 00:07:27 +02:00
Laurent Destailleur
99da69fb69
NEW Can edit the price of predefined product during adding in documents
2019-10-07 21:01:52 +02:00
Laurent Destailleur
51be0fad99
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-07 20:52:39 +02:00
Laurent Destailleur
bb72efefc5
Fix phpcs
2019-10-07 20:52:27 +02:00
Laurent Destailleur
e5026157e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2019-10-07 20:49:30 +02:00
Laurent Destailleur
539f4355c3
Try to fix stickler
2019-10-07 20:48:44 +02:00
Frédéric FRANCE
c68de09ba9
use $this->db in box
2019-10-07 20:27:51 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password
2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608
validate the 0 as min value consecutive; meaning not take that rule into account
2019-10-07 17:53:23 +02:00
Florian Mortgat
2aee62ea28
FIX: $from and $sendto variables are unescaped in the sending error message
...
This causes addresses like Tom <tom@examp.le> not to be shown in the message.
2019-10-07 17:32:52 +02:00
Laurent Destailleur
297313e7de
CSS
2019-10-07 16:01:36 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault
...
NEW : Address/Contact by default on third parties
2019-10-07 15:27:58 +02:00
Laurent Destailleur
3a15485e99
Update interface_90_modSociete_ContactRoles.class.php
2019-10-07 15:27:23 +02:00
Laurent Destailleur
240785922e
Update interface_90_modSociete_ContactRoles.class.php
2019-10-07 15:23:30 +02:00
Laurent Destailleur
a9c844460b
Debug use of widget on Accounting home page
2019-10-07 14:39:29 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
...
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
ptibogxiv
9aa7226d39
Update member.lib.php
2019-10-07 13:38:05 +02:00
Laurent Destailleur
e02794248e
Merge branch 'develop' into patch-264
2019-10-07 13:25:16 +02:00
Laurent Destailleur
12d243b8d4
FIX #12040
2019-10-07 13:13:46 +02:00
Laurent Destailleur
1060ac4608
Merge pull request #12035 from atm-john/develop_fix_missing_dolgetstatus
...
Fix : LibStatut missing dolgetstatus usage
2019-10-07 13:08:33 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
...
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:57:52 +02:00
Laurent Destailleur
7015e71105
FIX #12041
2019-10-07 12:53:32 +02:00
Laurent Destailleur
e7aa78cb4a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 12:37:20 +02:00
Laurent Destailleur
23de8694fa
Fix module files
2019-10-07 12:37:01 +02:00
Laurent Destailleur
f4b752ee81
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/core/modules/modProduct.class.php
htdocs/expedition/card.php
2019-10-07 12:33:13 +02:00
VESSILLER
219b0d8925
FIX Import of product using units
2019-10-07 12:26:02 +02:00
atm-lena
8c024b3786
FIX : missing "$this->id" in "fetch" function
2019-10-07 11:26:10 +02:00
Laurent Destailleur
ecd7d1208d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-07 10:42:49 +02:00
Laurent Destailleur
fc90638b2b
Code comment
2019-10-07 10:42:18 +02:00
Laurent Destailleur
b85c4f0864
Merge branch 'develop' into new-import-product-country-code
2019-10-07 10:41:35 +02:00
Laurent Destailleur
c3ae87816f
Merge pull request #12049 from frederic34/holidayz
...
lang file for holidays is holiday
2019-10-07 10:21:36 +02:00
Frédéric FRANCE
f80fa08a2d
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-07 07:57:05 +02:00
Laurent Destailleur
80c1a92872
FIX Load chart of account only if we click or select button "Load chart"
2019-10-06 21:11:29 +02:00
Laurent Destailleur
a3d0b9e374
Fix syntax error
2019-10-06 18:11:28 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-06 15:56:21 +02:00
Laurent Destailleur
2b66282b61
NEW Code for extrafields uses the new array $extrafields->attributes
2019-10-06 14:41:52 +02:00
Laurent Destailleur
76dad97cb1
Fix syntax error
2019-10-06 14:39:43 +02:00
Laurent Destailleur
6743169faa
Fix js syntax error
2019-10-06 14:34:24 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday
2019-10-06 11:29:24 +02:00
Frédéric FRANCE
6384e7eb67
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-05 20:02:16 +02:00
Laurent Destailleur
b883a8092a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/product.lib.php
htdocs/core/tpl/extrafields_list_search_input.tpl.php
htdocs/fourn/facture/card.php
htdocs/product/class/html.formproduct.class.php
2019-10-05 19:35:40 +02:00
Laurent Destailleur
ac8837d01f
Fix url
2019-10-05 19:28:00 +02:00
Laurent Destailleur
7f5ccf4b8e
Remove google+
2019-10-05 19:27:14 +02:00
Laurent Destailleur
e90234c2bc
FIX escape email alias
2019-10-05 14:27:37 +02:00
Laurent Destailleur
c36d49a8c3
FIX escape email alias
2019-10-05 14:15:14 +02:00
Laurent Destailleur
031c5523d4
NEW Add link to the public interface on the ticket card.
2019-10-05 11:52:30 +02:00
Laurent Destailleur
827b1fe5d2
Use small image instead of mini for preview on document list
2019-10-05 11:17:09 +02:00
Laurent Destailleur
8bf9afb7ca
FIX Attachement of linked files on ticket when sending a message
2019-10-04 19:41:35 +02:00
stickler-ci
bc32d684a4
Fixing style errors.
2019-10-04 16:12:33 +00:00
florian HENRY
2d3dd9ed3c
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault
2019-10-04 18:10:16 +02:00
Laurent Destailleur
ef15bbee4a
Increase delay of hide of popup so we have a chance to click on content
2019-10-04 16:53:58 +02:00
Laurent Destailleur
503973cec9
FIX Edit of ticket module parameters erased others
2019-10-04 14:04:31 +02:00
VESSILLER
0e23fbc6df
NEW add country code in import product model
2019-10-04 10:04:02 +02:00
ATM john
027c8224b0
Fix dolGetStatus unused
2019-10-03 21:34:01 +02:00
Alexandre SPANGARO
ddadff5731
Add globe fa-icon
2019-10-03 21:32:55 +02:00
ATM john
77f666a236
Fix dolGetStatus param
2019-10-03 21:28:11 +02:00
Alexandre SPANGARO
8668e7157a
Add bookmark fa-icon
2019-10-03 21:00:59 +02:00
Alexandre SPANGARO
d0840b038f
Remove constant MAIN_DISABLE_FONT_AWESOME_5
2019-10-03 20:42:02 +02:00
Alexandre SPANGARO
14381927c7
Fix Bank Fa-icon
2019-10-03 20:32:15 +02:00
Laurent Destailleur
aa484d484d
css
2019-10-03 19:02:29 +02:00
Frédéric FRANCE
0383fdbeee
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 18:37:14 +02:00
Laurent Destailleur
c223c5635b
Merge pull request #12010 from laudeco/feature/12006-country-on-pdf-footer
...
[#12006 ] - adds the country in the address of the PDF's footer
2019-10-03 18:15:39 +02:00
Laurent Destailleur
e52b294779
Merge pull request #12012 from frederic34/ficheinter_rec
...
restore unfinished old commit
2019-10-03 18:10:16 +02:00
Laurent Destailleur
e9163015e5
Merge pull request #12029 from altatof/limitlang
...
NEW : add MAIN_LANGUAGES_ALLOWED constant to limit languages displayed
2019-10-03 18:08:35 +02:00
Laurent Destailleur
b787e53020
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-10-03 17:54:58 +02:00
Laurent Destailleur
1a66e0b05e
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/product/card.php
2019-10-03 17:53:59 +02:00
Laurent Destailleur
d9aa816197
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:52:06 +02:00
Laurent Destailleur
75be637b0b
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-10-03 17:50:57 +02:00
Laurent Destailleur
74d3850ec8
Merge pull request #12030 from altatof/fckticket
...
NEW : FCKeditor setup for tickets
2019-10-03 17:49:59 +02:00
Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +02:00
Laurent Destailleur
e59c70116f
Merge pull request #12021 from frederic34/patch-14
...
fix broken search
2019-10-03 15:57:31 +02:00
Laurent Destailleur
fce33240f3
Merge pull request #12013 from Ahuahuachi/develop
...
Translate french documentation
2019-10-03 15:56:42 +02:00
stickler-ci
3168ad404c
Fixing style errors.
2019-10-03 13:56:33 +00:00
Laurent Destailleur
95c73f7b46
Merge pull request #12025 from seebag/fix/no_sub_members
...
Fix for no subscription members
2019-10-03 15:52:16 +02:00
altairis
153121b95d
add MAIN_LANGUAGES_ALLOWED constant
2019-10-03 15:48:24 +02:00
Laurent Destailleur
b60ee4c18c
css
2019-10-03 09:58:49 +02:00
Sebastien Baguet
9daffcbe07
Fix for no subscription members
2019-10-03 00:29:41 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php
2019-10-03 00:22:14 +02:00
Frédéric FRANCE
feaa5e2bd0
json query path
2019-10-02 22:15:24 +02:00
Frédéric FRANCE
6d117a501a
Update company.lib.php
2019-10-02 22:11:27 +02:00
Frédéric FRANCE
453ae05030
Update company.lib.php
2019-10-02 22:09:50 +02:00
Frédéric FRANCE
9f7f263f79
fix broken search
2019-10-02 21:49:36 +02:00
Frédéric FRANCE
37bb548d21
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 20:56:32 +02:00
Laurent Destailleur
b6a95b4be5
Look and feel v11
2019-10-02 19:04:24 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 18:59:18 +02:00
Laurent Destailleur
f89701b4d4
Fix technical id align on left
2019-10-02 18:55:18 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Frédéric FRANCE
146275f763
Merge remote-tracking branch 'upstream/develop' into ficheinter_rec
2019-10-02 17:38:18 +02:00
Laurent Destailleur
320e9bbeec
Text on tooltip can also be clickable
2019-10-02 15:54:42 +02:00
Laurent Destailleur
c6d38227b6
NEW Use a dedicated css for the pencil to edit a field
2019-10-02 14:44:38 +02:00
Laurent Destailleur
66829aa615
Use span instead of div by default for the tooltip picto.
2019-10-02 14:33:31 +02:00
florian HENRY
8c9cee1565
resolve conflict
2019-10-02 12:49:38 +02:00
florian HENRY
371ff76f5e
resolve copflict
2019-10-02 12:46:35 +02:00
Frédéric FRANCE
ad3cbd17c2
backport commit for setmulticurrency
...
a489207122 (diff-48f18024fb928ce21b76ef02fc967c67)
2019-10-02 11:12:30 +02:00
Alexandre SPANGARO
94179f712d
Update areacode
2019-10-02 08:58:25 +02:00
Alexandre SPANGARO
848acb6096
Update index
2019-10-02 08:49:33 +02:00
Alexandre SPANGARO
a6e429ff32
Merge remote-tracking branch 'upstream/develop' into 11.0_accountancy_portal
2019-10-02 08:49:00 +02:00
Frédéric FRANCE
802236f583
db escape
2019-10-02 08:31:46 +02:00
Alfredo Altamirano
9d75d7ac15
Translate french documentation
2019-10-02 00:55:46 -05:00
Laurent Destailleur
ba7a288abb
Fix colspan and columns of contact of thirdparties
2019-10-01 23:28:13 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 22:03:33 +02:00
Frédéric FRANCE
26c34198bf
show contact
2019-10-01 21:38:16 +02:00
Laurent De Coninck
3a25beabe6
add the country in the address of the PDF's footer
2019-10-01 21:03:58 +02:00
ATM john
4d5ffbb5c4
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature
2019-10-01 20:45:04 +02:00
florian HENRY
d48f0fa791
resolve conflixt
2019-10-01 18:07:59 +02:00
Laurent Destailleur
68055e579f
Check array is array
2019-10-01 16:26:55 +02:00
Laurent Destailleur
8ad81a092a
Clean code
2019-10-01 16:19:54 +02:00
Laurent Destailleur
1ff8b879a8
Fix phpcs
2019-10-01 16:10:35 +02:00
Laurent Destailleur
29a2601b9d
Merge pull request #11567 from inoveaconseil/ContextDashboard
...
WIP: Context dashboard
2019-10-01 15:21:35 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
...
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
52b0a0d609
The variable $out seems to be never defined.
2019-10-01 13:45:18 +02:00
Laurent Destailleur
f91242c66c
Fix css
2019-10-01 13:37:08 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 12:25:34 +02:00
Laurent Destailleur
fa921739ec
Remove duplicate code
2019-10-01 12:03:17 +02:00
Laurent Destailleur
11e01f5c86
Use correct style for table header
2019-10-01 12:02:28 +02:00
Frédéric FRANCE
7872a93605
Update box_commandes.php
2019-10-01 11:36:33 +02:00
Frédéric FRANCE
4ff65ce586
Update box_supplier_orders.php
2019-10-01 11:36:29 +02:00
Frédéric FRANCE
d201515514
Update box_prospect.php
2019-10-01 11:36:24 +02:00
Laurent Destailleur
15e646cc62
Fix bad name of trigger
2019-10-01 11:34:35 +02:00
Laurent Destailleur
c7da05e4a1
Fix bad name of trigger
2019-10-01 11:28:10 +02:00
Laurent Destailleur
6ebd060315
Use php var with same name than html var
2019-10-01 11:23:38 +02:00
Laurent Destailleur
0828000626
Merge pull request #12005 from laudeco/feature/filter_contacts
...
working solution about filtering the contacs of one company
2019-10-01 11:19:29 +02:00
Laurent Destailleur
0f4f5d47f2
Update company.lib.php
2019-10-01 11:18:53 +02:00
Laurent Destailleur
955d9daf38
Update company.lib.php
2019-10-01 11:18:14 +02:00
Laurent Destailleur
76bd09cfb5
Merge pull request #12002 from frederic34/patch-18
...
Update box_supplier_orders.php to show email
2019-10-01 11:16:40 +02:00
Laurent Destailleur
f151dc1951
Merge pull request #12000 from frederic34/zapier2
...
zapier trigger
2019-10-01 11:16:27 +02:00
Laurent Destailleur
2d8e3aad5b
Merge pull request #12001 from frederic34/patch-17
...
Update box_prospect.php to show email
2019-10-01 11:13:01 +02:00
stickler-ci
5e075d5d30
Fixing style errors.
2019-10-01 06:39:26 +00:00
Frédéric FRANCE
c57c8eee88
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-01 07:41:10 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
Frédéric FRANCE
f3f2ab8aad
Update box_commandes.php
2019-09-30 22:45:28 +02:00
