florian HENRY
42fed5981d
bettre syntax
2018-03-09 19:16:06 +01:00
florian HENRY
02beed265e
better space
2018-03-09 19:14:43 +01:00
florian HENRY
5a56e802d9
FIX #8232
2018-03-09 19:10:52 +01:00
Maxime Kohlhaas
4e222d3d92
Comment for travis
2018-03-09 19:09:16 +01:00
Maxime Kohlhaas
ded69bf57d
New : link users to company like a tag
2018-03-09 18:59:06 +01:00
Marc de Lima Lucio
d6b4bc14e4
NEW: syslog file autoclean
2018-03-09 16:52:06 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
...
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Laurent Destailleur
47b03068ac
Merge pull request #8300 from hregis/develop_dict
...
Fix: regression, restore primary key
2018-03-08 16:22:23 +01:00
Laurent Destailleur
0b316c3980
Attach invoice on email subscription confirmation
2018-03-08 15:01:34 +01:00
Regis Houssin
fd9c79fa7f
Fix: use getEntity if no rowid to compare
2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49
Fix: regression, restore primary key
2018-03-08 07:41:54 +01:00
Laurent Destailleur
fe45e82e99
Fix use of table llx_c_paiement (param showempty was not used/set)
2018-03-07 19:00:38 +01:00
Marc de Lima Lucio
884b74a6bb
FIX: warning when adding ECM files using old photo path
2018-03-07 17:12:59 +01:00
Laurent Destailleur
7e6ba51780
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
Laurent Destailleur
1ca5c7083a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00
florian HENRY
03873038d5
fix comment task
2018-03-07 08:47:34 +01:00
Laurent Destailleur
1e6a55745c
CSS
2018-03-06 11:54:05 +01:00
Laurent Destailleur
a086bd0137
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_linkedfiles.inc.php
htdocs/core/class/utils.class.php
2018-03-06 09:20:45 +01:00
Marc de Lima Lucio
f1faf155fc
FIX: supplier discounts: wrong link to source supplier invoice
2018-03-05 11:41:06 +01:00
Marc de Lima Lucio
480d756090
FIX: supplier discounts: typo
2018-03-05 11:30:18 +01:00
Marc de Lima Lucio
1765b09fda
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-05 11:05:38 +01:00
Laurent Destailleur
864edce665
NEW Accept anonmymous events (no user assigned)
...
NEW Online payment now record the payment on invoices
2018-03-04 19:39:46 +01:00
Laurent Destailleur
9355c5a8d7
Fix scrutinizer
2018-03-04 11:31:57 +01:00
Laurent Destailleur
e574ec4bf1
Fix backward compatibility
2018-03-04 11:28:01 +01:00
Laurent Destailleur
82fd84fb48
Fix scrutinizer errors
2018-03-04 11:22:43 +01:00
Laurent Destailleur
6338328c90
Fix scrutinizer errors
2018-03-04 11:09:53 +01:00
Laurent Destailleur
44eb50c424
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:57:10 +01:00
Laurent Destailleur
eac1b2efe9
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:23:23 +01:00
Laurent Destailleur
f0c9cd3acc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-03 11:22:31 +01:00
Laurent Destailleur
d6b782e5ef
FIX Infinite loop on deletion of temp file when there is symbolic links
2018-03-03 11:22:15 +01:00
Laurent Destailleur
0a5edb871b
Merge pull request #8253 from ruistrecht-alt/Fix_supress_count_warning_in_extrafields_view_tpl
...
FIX Suppress count warning in admin_extrafields_view.tpl
2018-03-02 18:00:52 +01:00
Laurent Destailleur
7584fe62e3
Merge pull request #8244 from hregis/develop_bug
...
Fix: avoid warning during "upgrade2" process
2018-03-02 17:51:47 +01:00
Laurent Destailleur
48b578b9f2
Update commonobject.class.php
2018-03-02 17:51:21 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany
...
Fix: use "multidir_output" instead "dir_output" (propal)
2018-03-02 17:49:25 +01:00
Laurent Destailleur
bf36f00897
Update html.formfile.class.php
2018-03-02 17:48:58 +01:00
Marc de Lima Lucio
451d943927
NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts)
2018-03-02 16:48:25 +01:00
Laurent Destailleur
e073fa15f7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-02 14:00:27 +01:00
Laurent Destailleur
c478ab952f
Fix block to generate donation document missing
2018-03-02 11:57:39 +01:00
Laurent Destailleur
191a1e9350
Fix css
2018-03-02 11:18:29 +01:00
Laurent Destailleur
132ee2c788
CSS
2018-03-01 16:48:12 +01:00
Laurent Destailleur
0f237e4d5c
NEW Add mass action enable/disable on cron job list
2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
e07177fec2
FIX: supplier relativ discounts: pre-fill newlines with qty/discount
2018-03-01 12:31:33 +01:00
Laurent Destailleur
2368cb615f
Look and feel v8
2018-03-01 11:51:25 +01:00
Marc de Lima Lucio
059801fe03
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-01 10:22:21 +01:00
Laurent Destailleur
de9f1aab0f
NEW Can set the reply-to into email sent
2018-02-28 19:09:05 +01:00
Laurent Destailleur
575fc9f90d
NEW add hook moreHtmlStatus to complete to status on banners
2018-02-27 22:06:21 +01:00
Laurent Destailleur
04934cc4aa
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/functions.lib.php
htdocs/projet/tasks/time.php
2018-02-27 19:18:43 +01:00
Laurent Destailleur
03858d73b1
NEW Add extrafield type "html"
2018-02-27 17:30:13 +01:00
Marc de Lima Lucio
7cd1b2caa9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-27 16:45:01 +01:00
Laurent Destailleur
8ac4cb9c43
Add fetch_product
2018-02-27 16:33:50 +01:00
Rui Strecht
24ae7b4780
Suppress count warning in admin_extrafields_view.tpl
2018-02-27 14:45:17 +00:00
Laurent Destailleur
7d3162313e
FIX Temporary dir for mail files must be cleaned at beginning of form
2018-02-27 10:59:26 +01:00
Regis Houssin
1aa1b0a3ea
Fix: avoid warning during "upgrade2" process
2018-02-26 12:15:30 +01:00
Laurent Destailleur
0d12552445
NEW Can enter time spent from the list of time spent of project
2018-02-26 11:57:29 +01:00
Regis Houssin
365fffddf5
Fix: missing object entity
2018-02-26 11:35:44 +01:00
Regis Houssin
093ea49cc6
Fix: use "multidir_output" instead "dir_output"
2018-02-26 11:35:30 +01:00
Laurent Destailleur
4866d63ece
Fix method getListOfPayments in the wrong class
2018-02-26 09:45:15 +01:00
Laurent Destailleur
1666f371bf
css
2018-02-26 00:13:16 +01:00
Laurent Destailleur
003827eb06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-25 15:01:19 +01:00
Laurent Destailleur
2cd5ed65a6
Clean deprecated (field unit_charge in supplier price)
2018-02-25 14:13:09 +01:00
Laurent Destailleur
8dceb8930f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formactions.class.php
htdocs/user/card.php
2018-02-25 12:41:17 +01:00
Laurent Destailleur
c604ce0a06
Fix date in odt
2018-02-24 15:31:30 +01:00
Laurent Destailleur
3b5a3915c4
NEW Use common substitution rule for language to get translation in ODT
2018-02-24 14:23:52 +01:00
Laurent Destailleur
38d1fc27e0
Start to introduce common substitution rules for odt substitutions
2018-02-24 13:41:01 +01:00
Laurent Destailleur
c8078b54b5
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
2018-02-24 12:52:57 +01:00
Laurent Destailleur
435e4823a5
Fix some warning during install
2018-02-24 11:58:09 +01:00
Laurent Destailleur
d8bf553ea9
Add option THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD for logo indexing
2018-02-23 19:55:15 +01:00
Laurent Destailleur
7cf7bf6e45
Code comment
2018-02-23 16:26:23 +01:00
Laurent Destailleur
f3e1e81219
Fix update of extrafield password that are crypted
2018-02-23 16:11:25 +01:00
Laurent Destailleur
93a8176813
Fix do not encrypt if empty
2018-02-23 15:28:24 +01:00
Laurent Destailleur
863cab362f
NEW Cat set the encryption algorithm for extrafields of type password
2018-02-23 14:38:41 +01:00
Laurent Destailleur
cc618e886f
Fix extrafield password must be >= than 64 for password_hash
2018-02-23 13:19:33 +01:00
Laurent Destailleur
82ae65b18d
NEW Can get template of email from its label
2018-02-23 11:23:36 +01:00
Laurent Destailleur
420fe3a07a
Clean code
2018-02-22 17:05:45 +01:00
Laurent Destailleur
a27ed54128
Fix sort order of email templates
2018-02-22 16:40:48 +01:00
John
a7a6630fad
Add popin dialog
2018-02-22 15:19:20 +01:00
Laurent Destailleur
b87feab1e3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-02-22 12:19:20 +01:00
Laurent Destailleur
51cfb9795e
Fix bad picto
2018-02-22 11:26:41 +01:00
Juanjo Menent
1d6baf5f2b
Fix: Not showing link to ad event if module is disabled
2018-02-22 10:16:53 +01:00
John
f313fb925b
Add new checkbox for lines
2018-02-21 17:06:40 +01:00
Laurent Destailleur
b4446764f8
Clean code of deprecated usage
2018-02-21 14:48:25 +01:00
John
bd0e8506f5
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-02-21 11:53:16 +01:00
Laurent Destailleur
72c1357c9b
NEW Section of files generated by mass action not visible if empty
2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb
Clean code around fetch_optionals()
2018-02-20 19:38:18 +01:00
Laurent Destailleur
34135e0a13
Fix extrafield date or datetime with bad timezone
2018-02-20 19:20:47 +01:00
Laurent Destailleur
e465b0c40e
Fix extrafield date or datetime with bad timezone
2018-02-20 19:19:27 +01:00
Laurent Destailleur
71cbcce3a2
NEW Can select sample to use when creating a new page
2018-02-20 18:10:11 +01:00
John
09c5dc506a
Add html dom element and fix class
2018-02-20 17:46:32 +01:00
John
5624257a6d
add new dom html5 elements and class
2018-02-20 16:49:49 +01:00
Marc de Lima Lucio
95be155010
FIX: supplier credit notes: harmonize discount filters
2018-02-20 12:26:29 +01:00
Laurent Destailleur
5f51af505f
NEW Can delete dir content in media and ECM module recursively
2018-02-19 23:52:45 +01:00
Laurent Destailleur
1ee128ff13
NEW Add type of website container/page into dictionary
2018-02-19 19:48:53 +01:00
Marc de Lima Lucio
44b0d1ca0f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-02-19 17:33:20 +01:00
Marc de Lima Lucio
f5ad93b272
NEW: supplier credit notes: handle Excess Paid + translation
2018-02-19 15:52:07 +01:00
Laurent Destailleur
60fe1fa503
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/mails.php
2018-02-17 01:19:17 +01:00
Laurent Destailleur
f67f0df609
Fix preview link not visible with long file names
2018-02-16 12:11:39 +01:00
Marc de Lima Lucio
e2b65b3755
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note
2018-02-16 09:14:53 +01:00
Laurent Destailleur
362aec3e4b
NEW Add param $dolibarr_main_restrict_ip in config file to limit ips
2018-02-15 19:49:50 +01:00
Laurent Destailleur
6b74c79798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/website.lang
2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb
Fix responsive
2018-02-15 12:57:04 +01:00
Laurent Destailleur
b515448bbd
Fix delete when no extrafields used
2018-02-15 00:01:25 +01:00
Laurent Destailleur
5f0f9ff326
Fix delete page
2018-02-14 23:57:57 +01:00
Laurent Destailleur
78697c1735
USe fk_product is better than ref
2018-02-14 21:14:24 +01:00
Laurent Destailleur
f3ffc7ce8a
Merge pull request #8185 from BitKFu/develop
...
NEW Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
2018-02-14 20:56:00 +01:00
Marc de Lima Lucio
daca27b2ed
NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring
2018-02-14 18:02:40 +01:00
Marc de Lima Lucio
4f9bb33600
NEW: supplier credit notes: convert to usable absolute discount + link/unlink to supplier invoice + create supplier credit note from excess paid
2018-02-14 10:47:10 +01:00
Laurent Destailleur
795cbaa978
Code comment
2018-02-13 20:13:35 +01:00
Laurent Destailleur
b128c95a74
NEW Add showempty parameter in country selection
2018-02-13 19:08:46 +01:00
Laurent Destailleur
e510e1b679
Fix search field at wrong column
2018-02-13 15:48:29 +01:00
Laurent Destailleur
35aece060c
Search field in correct column
2018-02-13 15:47:17 +01:00
Laurent Destailleur
1a4aa89489
NEW Can share any file from the "Document" tab.
2018-02-13 13:55:36 +01:00
Gerhard Stephan
f93934905f
Implemented a correct error handling, if the $line->product_ref has not been set
2018-02-13 08:41:57 +01:00
Laurent Destailleur
36ac380cac
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-12 22:26:48 +01:00
Gerhard Stephan
2aaf3a466d
Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
...
This fixes the issue #3185
https://github.com/Dolibarr/dolibarr/issues/3185
2018-02-12 21:38:51 +01:00
Laurent Destailleur
b2835fc803
Fix check of vat only for european countries
2018-02-12 15:54:24 +01:00
Laurent Destailleur
eccdc9a075
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/langs/pt_PT/companies.lang
2018-02-08 15:20:24 +01:00
Laurent Destailleur
ab21769aa2
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/card.php
2018-02-08 12:58:47 +01:00
Rui Strecht
ecea8d698c
Forgot that MAIN_SHOW_STATE_CODE is not just 0 or 1
2018-02-07 16:07:33 +00:00
Rui Strecht
8c732a1443
Trying to not include sql request into method setMysoc
2018-02-06 12:01:54 +00:00
Rui Strecht
31372f8948
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/core/class/commonobject.class.php
2018-02-06 10:26:38 +00:00
Laurent Destailleur
ea92f6beae
Fix for multicompany
2018-02-06 10:57:53 +01:00
Laurent Destailleur
565372eaab
Fix param showsize. Fix extrafields field too long
2018-02-06 10:34:29 +01:00
Laurent Destailleur
eedbcbdc40
Merge branch 'develop' into patch-2
2018-02-05 15:43:18 +01:00
Laurent Destailleur
6291cb4cbe
Update commonobject.class.php
2018-02-05 15:41:34 +01:00
Laurent Destailleur
9a0dca57af
Update commonobject.class.php
2018-02-05 15:40:18 +01:00
Laurent Destailleur
9731a7fedc
Code for update more similar than insert
2018-02-05 15:31:40 +01:00
Regis Houssin
839de65012
Fix: avoid error -1
2018-02-05 11:30:31 +01:00
Laurent Destailleur
0cc6654b06
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:25:00 +01:00
Laurent Destailleur
5a609215d5
Fix default value was not save at creation
...
Conflicts:
htdocs/core/class/extrafields.class.php
2018-02-04 13:23:04 +01:00
Laurent Destailleur
aff6bced4a
Fix default value was not save at creation
2018-02-04 13:20:47 +01:00
Laurent Destailleur
4fdde55c59
Keep empty graph if graph is called with empty data
2018-02-04 12:14:39 +01:00
Laurent Destailleur
f57ea2682a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/notify.class.php
htdocs/societe/class/societe.class.php
2018-02-03 19:33:24 +01:00
Laurent Destailleur
7c6c893657
Merge pull request #7996 from atm-maxime/new_force_mailto
...
NEW Option to force all emails recipient
2018-02-03 19:15:11 +01:00
Laurent Destailleur
833c7685e1
Hook 'maildao' was renamed into 'mail' into the method sendfile that
...
send emails, and method was renamed from 'doaction' into 'sendMail'.
To process task #4875 #7969 in several steps.
2018-02-03 17:36:33 +01:00
Regis Houssin
13106d34a6
Fix: compatibility with multicompany sharing
2018-02-02 12:36:47 +01:00
Laurent Destailleur
f51d6a2e50
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-02-02 10:07:16 +01:00
Laurent Destailleur
a7357e67f9
Code comment
2018-02-01 20:19:04 +01:00
Laurent Destailleur
0412d3d11d
Fix extrafield mandatory check.Fix empty extrafields with type link.
2018-02-01 19:05:24 +01:00
Laurent Destailleur
ed3bcf59b6
Try doc hint array of array of int with @var int[][]
2018-02-01 10:50:50 +01:00
Laurent Destailleur
7f9d6a5458
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/public/paybox/newpayment.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
htdocs/public/stripe/newpayment.php
2018-01-31 20:25:24 +01:00
Laurent Destailleur
14ecdce650
Fix merge of thirdparties (pb when merging codes and error management)
2018-01-31 18:01:56 +01:00
Laurent Destailleur
de0a8ba71f
Fix extrafields
2018-01-31 14:01:58 +01:00
Rui Strecht
b387c3fdf8
Forgot to update other files to same PR changes
2018-01-31 11:45:30 +00:00
Rui Strecht
75b9caf744
Merge branch 'develop' into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2018-01-31 11:19:39 +00:00
Laurent Destailleur
e9f8c7ba01
Fix edit of extrafields "link" corrupts the data definition
2018-01-31 10:51:40 +01:00
Laurent Destailleur
d6317a26d2
Fix for multicompany
2018-01-30 15:48:09 +01:00
Laurent Destailleur
8d983717a3
Merge pull request #8068 from atm-quentin/NEW_filter_export_model_by_user
...
NEW export filter models can be share or not by user
2018-01-29 21:19:50 +01:00
Laurent Destailleur
98c7ac9362
Merge pull request #8100 from ruistrecht-alt/label_for_MAIN_SHOW_REGION_IN_STATE
...
NEW: Option MAIN_SHOW_REGION_IN_STATE renamed into MAIN_SHOW_REGION_IN_STATE_SELECT and more complete
2018-01-29 21:08:18 +01:00
Laurent Destailleur
8102883356
Fix error when email list contains ', ,'
...
Fix output dir of notification
2018-01-29 20:36:40 +01:00
Laurent Destailleur
4eb7d7a332
Debug blockedlog with various payments
2018-01-29 18:22:26 +01:00
Frédéric FRANCE
def89d30ae
Merge remote-tracking branch 'upstream/develop' into patch-2
2018-01-28 15:36:40 +01:00
Laurent Destailleur
65c7117240
Fix var serialized twice
2018-01-27 19:40:42 +01:00
Laurent Destailleur
7dcb3bf6fc
Fix var not initialized
2018-01-27 19:40:35 +01:00
Laurent Destailleur
7a2992bc4b
Fix var serialized twice
2018-01-27 19:35:30 +01:00
Laurent Destailleur
f1cd905bf1
Fix var not initialized
2018-01-27 19:29:57 +01:00
Laurent Destailleur
eb3eee9b6a
Code comment
2018-01-26 15:25:47 +01:00
Frédéric FRANCE
336c44dc88
trigger on shipping method update
2018-01-26 08:33:35 +01:00
Frédéric FRANCE
d0e83b7902
trigger on bank account update
2018-01-26 08:14:39 +01:00
Frédéric FRANCE
ec38b8a5a2
Update interface_99_modMyModule_MyModuleTriggers.class.php
2018-01-25 22:07:10 +01:00
Frédéric FRANCE
0568461a7b
swiftmailer
2018-01-25 22:03:51 +01:00
Frédéric FRANCE
9e0a548eff
Update commonobject.class.php
2018-01-25 17:42:25 +01:00
Rui Strecht
a13866f091
Changed MAIN_SHOW_REGION_IN_STATE to MAIN_SHOW_REGION_IN_STATE_SELECT for clarity
2018-01-25 16:14:39 +00:00
Laurent Destailleur
60c1a1e745
Code comment on accesskey
2018-01-24 17:29:29 +01:00
Laurent Destailleur
d796f403a9
Fix sender email when sending a password remind
2018-01-24 15:43:55 +01:00
Laurent Destailleur
273e88a599
Fix send into ledger for expense report. Show accounted status.
2018-01-22 03:07:11 +01:00
Frédéric FRANCE
d31684376a
swiftmailer
2018-01-21 18:59:48 +01:00
Frédéric FRANCE
a34b99f3ec
swiftmailer
2018-01-21 15:55:56 +01:00
atm-quentin
ce29331c05
NEW Filter export model by user
2018-01-18 12:34:22 +01:00
Laurent Destailleur
1a04178d64
Clean unused file and fix missing translation
2018-01-17 11:20:18 +01:00
Laurent Destailleur
1c3fb7f94b
Fix responsive of boxes
2018-01-16 16:15:49 +01:00
Laurent Destailleur
51421a8bf6
Fix position of fields
2018-01-15 18:11:56 +01:00
Laurent Destailleur
926683763b
Modulebuilde fix sort of fields, fix generation of files
2018-01-15 17:38:15 +01:00
Laurent Destailleur
193dfec29e
Merge pull request #8061 from fappels/7.0_fix_module_builder
...
7.0 fix module builder
2018-01-15 11:32:40 +01:00
fappels
00185bd9d4
Fix fetchCommon should return 0 iso error if not found
2018-01-15 11:21:24 +01:00
Laurent Destailleur
3c3402bc60
Debug API for prices of products
2018-01-14 15:58:04 +01:00
fappels
25b455272a
Fix 0 is a valif value for a NOT NULL field
2018-01-14 15:31:31 +01:00
Laurent Destailleur
f0d6099e5f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/db/DoliDB.class.php
htdocs/core/lib/functions.lib.php
2018-01-14 03:15:49 +01:00
Laurent Destailleur
9f6118ed52
Code comments
2018-01-14 03:12:22 +01:00
Laurent Destailleur
7a087327e1
Fix deprecated code
2018-01-13 19:33:40 +01:00
Laurent Destailleur
7c480f76e3
Fix thumbs of pdf at wrong place
...
Fix param not provided
Fix css
2018-01-13 16:09:05 +01:00
Laurent Destailleur
7a88afe962
Fix field enabled and perms must differs
2018-01-13 13:16:33 +01:00
Laurent Destailleur
53b36435d0
Fix on smartphone
2018-01-12 20:50:18 +01:00
Laurent Destailleur
32a998e68d
Fix preview link
2018-01-12 16:28:10 +01:00
Laurent Destailleur
ad4b59d2c8
Fix scrutinizer
2018-01-12 15:33:21 +01:00
Laurent Destailleur
50596a5214
Fix trans key
2018-01-12 14:06:48 +01:00
Laurent Destailleur
15ed7584b8
Fix navigation in accounting account card
2018-01-11 17:06:06 +01:00
Laurent Destailleur
e141d43999
Fix bad links with mobile
2018-01-10 13:14:30 +01:00
Laurent Destailleur
9b448459c9
Fix dispatching replacement invoice into bookkeeping (not used by most
...
countries in europe)
2018-01-09 19:12:08 +01:00
Laurent Destailleur
b3465d441a
Missing ajaxcombobox
2018-01-04 10:45:48 +01:00
Laurent Destailleur
c98b5c7ec7
Fix css background
2018-01-02 17:27:05 +01:00
Laurent Destailleur
8388858715
Fix filemanager
2017-12-27 20:17:08 +01:00
Maxime Kohlhaas
a9c7dc48ab
New option to force e-mail recipient, helpful for test purposes
2017-12-24 17:31:31 +01:00
Laurent Destailleur
e6c7f9e69b
Debug module inventory
2017-12-22 21:29:09 +01:00
Laurent Destailleur
2b056b0177
BUG Fix of old hidden feature price per quantity
2017-12-22 12:53:46 +01:00
Laurent Destailleur
eab44f62b1
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_builddoc.inc.php
htdocs/core/class/html.form.class.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
htdocs/core/tpl/admin_extrafields_edit.tpl.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/notes.tpl.php
htdocs/main.inc.php
htdocs/product/inventory/tpl/inventory.tpl.php
htdocs/societe/tpl/linesalesrepresentative.tpl.php
2017-12-21 14:35:33 +01:00
Marcos García
b5804d18b8
Merge branch 'develop' into bug-6980
...
# Conflicts:
# htdocs/core/class/html.formmail.class.php
2017-12-21 12:03:03 +01:00
Laurent Destailleur
f1305bbdd6
Fix css
2017-12-20 21:14:22 +01:00
Laurent Destailleur
b03d0134a7
Filter on date extrafield timestamp and datetime disabled (not possible
...
yet)
2017-12-20 18:30:41 +01:00
Laurent Destailleur
3f6b3b51ca
Fix css
2017-12-20 15:09:58 +01:00
Laurent Destailleur
12d91d7444
Fix missing messages in error report.
...
Fix test on non empty array
2017-12-19 18:26:27 +01:00
Laurent Destailleur
f504716501
Fix sync contact - external user
2017-12-19 16:16:31 +01:00
Laurent Destailleur
1351a43a30
FIX Maxi debug of permission for users external or restricted to sales
...
representatives
2017-12-18 16:13:05 +01:00
Laurent Destailleur
98b82d712a
NEW Revenue stamp can be a percent
...
FIX Revenue stamp not visible on the transfer payment page
2017-12-18 12:43:03 +01:00
Laurent Destailleur
8e12551f17
Fix not employee must not appear on page to create salaries
2017-12-18 11:55:34 +01:00
Marcos García
f45c3e8231
FIX #6980 FormMail::getEmailTemplate returns an array instead of a ModelMail object
...
Close #6980
2017-12-17 23:42:50 +01:00
Laurent Destailleur
6f9822ddb3
Fix link for payment no set
2017-12-17 22:03:42 +01:00
Laurent Destailleur
4abcbae79f
NEW The unalterable log can be browse by any user with he permission
2017-12-16 21:36:36 +01:00
Laurent Destailleur
e90a6b8c0f
Option THEME_HIDE_BORDER_ON_INPUT to restore border on inputfields work
...
also with md theme.
2017-12-16 20:52:49 +01:00
Laurent Destailleur
9cdf322bfb
Fix scrutinizer bugs
2017-12-15 22:14:28 +01:00
Laurent Destailleur
c119d7dbb9
Code comment
2017-12-13 23:37:34 +01:00
Laurent Destailleur
247c380d18
Several fixes
2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d
Fix on search all (trim search + search from smartphone).
2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54
Fix several pb in links to projects on create page
2017-12-12 10:37:51 +01:00
Laurent Destailleur
9314dcb046
Fix regression
2017-12-12 10:13:48 +01:00
Laurent Destailleur
7efbcfa1e9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-12-11 13:50:49 +01:00
Laurent Destailleur
338f8d978a
Fix generation of doc in modulebuilder
2017-12-11 13:50:26 +01:00
Laurent Destailleur
acf2d2ee9a
Fix scrutinizer reported bugs
2017-12-11 11:48:11 +01:00
Laurent Destailleur
748aee9a54
Fix javascript error
2017-12-10 19:54:04 +01:00
Laurent Destailleur
2dae21259e
Fix the switch show more/less
2017-12-10 19:03:18 +01:00
Laurent Destailleur
02d9e93ed4
Fix badge and use of data-html instead of html tag
2017-12-10 15:46:35 +01:00
Laurent Destailleur
472d7b591e
Fix hook for formmail and translation
2017-12-10 02:01:36 +01:00
Laurent Destailleur
8d20473ffd
Fix date of extrafields
2017-12-09 23:19:29 +01:00
Laurent Destailleur
cc813df2a5
Fix modulebuilder
2017-12-09 20:17:47 +01:00
Laurent Destailleur
f22e7ee24a
Fixes
2017-12-09 17:29:19 +01:00
Laurent Destailleur
e3dcff7f5b
Fix substition for menus title and urls
2017-12-09 15:35:01 +01:00
Laurent Destailleur
95cb5025a2
Fix length of month too large
...
More complete template
2017-12-08 16:15:41 +01:00
Laurent Destailleur
f85e79e250
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/filefunc.inc.php
htdocs/holiday/class/holiday.class.php
2017-12-08 13:13:53 +01:00
Laurent Destailleur
8dc3d7323d
Merge pull request #7923 from fmarcet/6.0
...
FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
2017-12-08 13:02:07 +01:00
Ferran Marcet
bfc476a118
FIX #7379 : Compatibility with PRODUCT_USE_OLD_PATH_FOR_PHOTO varieable
2017-12-07 18:44:33 +01:00
Laurent Destailleur
74a63ca18c
Fix scrutinizer
2017-12-06 23:43:59 +01:00
Laurent Destailleur
8019f73f99
Fix: protection to not delete invoice if invoice is in bookkeeping
2017-12-05 10:01:30 +01:00
Laurent Destailleur
78c4b7f912
Fix look and feel v7
2017-12-04 20:17:07 +01:00
Laurent Destailleur
d2adec01b0
Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice
2017-12-03 20:18:00 +01:00
Laurent Destailleur
58edc06ac3
Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice
2017-12-03 20:15:04 +01:00
Laurent Destailleur
b41213f9a1
Add option MAIL_SMTP_USE_FROM_FOR_HELO to fix smtps best practice
2017-12-03 20:08:53 +01:00
Laurent Destailleur
cc05bb3c8c
Fix duplicate errors
2017-12-03 19:36:59 +01:00
Laurent Destailleur
ce32da6217
Fix debugs APIs
2017-12-01 15:39:18 +01:00
Laurent Destailleur
a0231b5c60
Fix responsive
2017-12-01 12:55:28 +01:00
Laurent Destailleur
670465fcd8
Fix responsive and search
2017-12-01 12:01:17 +01:00
Laurent Destailleur
b14cb7a97f
Debug accountancy
2017-11-28 11:49:11 +01:00
Laurent Destailleur
533a82187a
NEW Add a protection so we can't journalize non balanced transactions
2017-11-27 17:12:48 +01:00
Laurent Destailleur
57d4f28cba
Enhance usability of accounting module
2017-11-27 15:51:28 +01:00
alexis Algoud
61a3131fc4
fix include for ajax select product supplier order
2017-11-27 10:59:46 +01:00
Laurent Destailleur
e4d0213916
Removed duplicate code
2017-11-26 22:06:14 +01:00
Laurent Destailleur
c02528a479
NEW Accept substitution key __[ABC]__ replaced with value of const ABC
2017-11-25 19:55:31 +01:00
Laurent Destailleur
5935ad868a
Fix the from robot must be visible only on test page
2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd
Clean code
2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb
The form to test email can now use all sending profiles.
2017-11-25 18:52:47 +01:00
Laurent Destailleur
e6b16815aa
Fix responsive
2017-11-25 17:25:27 +01:00
Laurent Destailleur
e1484caa59
Fix responsive
2017-11-25 17:21:53 +01:00
Laurent Destailleur
1ea9137863
Fix sort order
2017-11-25 16:21:44 +01:00
Laurent Destailleur
5ba4a57b61
Fix sort on last actions
2017-11-25 16:05:45 +01:00
Laurent Destailleur
0b9a3087ea
Fix bug reported by scrutinizer
2017-11-25 12:11:02 +01:00
Laurent Destailleur
412c4e335d
Fix method of herited object has same signature than parent
2017-11-25 11:10:52 +01:00
Laurent Destailleur
88841ccbae
FIX #7590
2017-11-25 01:58:11 +01:00
Laurent Destailleur
c16a150a70
NEW Remove background on agenda view when event is a not busy event.
2017-11-24 20:02:46 +01:00
Laurent Destailleur
7ea96d53a2
Minor fixes
2017-11-24 18:12:01 +01:00
Laurent Destailleur
4f4f929efb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/holiday/class/holiday.class.php
2017-11-24 17:02:14 +01:00
Laurent Destailleur
2493c2468d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/core/lib/files.lib.php
2017-11-24 16:51:59 +01:00
Laurent Destailleur
21764ed0cf
Merge pull request #7856 from frederic34/patch-1
...
Update html.form.class.php
2017-11-24 16:33:00 +01:00
Laurent Destailleur
831099fef8
Debug modulebuilder
2017-11-24 16:24:42 +01:00
Laurent Destailleur
abe13d108b
Clean code used for autocompletion
2017-11-24 09:23:18 +01:00
Laurent Destailleur
9c22b5f335
Replace deprecated dol_print_graph with DolGraph
2017-11-23 20:24:05 +01:00
Laurent Destailleur
5cf21fef05
Use autocompletion on list of taxes
2017-11-23 15:46:52 +01:00
Laurent Destailleur
b93e35cdd2
Fix a lot of request to use the IN getentity instead of =
...
Fix a lot of request to use left join on type of payment table
2017-11-23 15:06:16 +01:00
Frédéric FRANCE
0ee30171db
Update html.form.class.php
2017-11-23 08:36:10 +01:00
Laurent Destailleur
5b77fe393e
Fix: contact not preselected
2017-11-23 00:59:43 +01:00
Laurent Destailleur
5a2fe13958
Fix travis
2017-11-22 21:36:01 +01:00
Laurent Destailleur
adce4b5b7b
Debug multi contact on event.
...
Prepare also code to manage properties of attendees of event
2017-11-22 14:42:47 +01:00
Laurent Destailleur
fd5cb736ce
Merge pull request #6961 from atm-ph/new_event_with_multi_contact
...
New multi contacts on actioncomm
2017-11-22 12:05:04 +01:00
Laurent Destailleur
aa91b9075a
Fix cancel button
2017-11-22 11:54:02 +01:00
Regis Houssin
a9bfe0f48f
Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876)
2017-11-22 10:12:51 +01:00
Laurent Destailleur
2b95679b84
Add info to help spam fight
2017-11-21 14:09:15 +01:00
Laurent Destailleur
4b4412d5da
Standardize file names for ECM
2017-11-20 19:40:34 +01:00
Laurent Destailleur
6953420ce8
Support for ar_EG as laternative of ar_AS
2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc
Work on public sharing files
2017-11-19 20:44:57 +01:00
Laurent Destailleur
4ad0d5df43
Fix scrutinizer issues
2017-11-19 16:55:28 +01:00
Laurent Destailleur
4938a0ba2a
Add param forcenowrap on tooltip function
2017-11-19 12:41:37 +01:00
Laurent Destailleur
9b1470dab5
Work on generic filemanager component
2017-11-18 22:13:19 +01:00
atm-ph
15a8f2037b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-11-18 11:54:21 +01:00
Laurent Destailleur
c85acbfc11
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/import/import_xlsx.modules.php
htdocs/install/repair.php
2017-11-14 19:47:33 +01:00
Laurent Destailleur
451d3ed8ed
NEW Add API to activate/unactivate a contract
2017-11-14 17:51:04 +01:00
Laurent Destailleur
a50589c3c9
NEW Better behaviour when using a text browser
2017-11-14 15:10:46 +01:00
Laurent Destailleur
11cb9c0d81
Code simpler
2017-11-14 01:57:50 +01:00
Laurent Destailleur
b5196b7164
FIX A lot of several fix on local taxes and NPR tax
2017-11-13 14:24:40 +01:00
Laurent Destailleur
53a523ba9d
Module builder
2017-11-12 20:45:06 +01:00
Laurent Destailleur
955ed7dbbf
NEW Show the supplier ref into supplier cards
2017-11-12 15:30:21 +01:00
Laurent Destailleur
186c8cdbf0
Fix selection of contact into creation of event
2017-11-12 13:40:05 +01:00
Laurent Destailleur
0cd8aa8a49
Merge pull request #7798 from hregis/develop_extrafields
...
Fix: missing status 3 (only on form)
2017-11-11 17:59:33 +01:00
Laurent Destailleur
d1860b87f8
NEW Add a confirmation for all mass action 'delete'
2017-11-11 16:34:11 +01:00
Laurent Destailleur
01a41237bf
CSS
2017-11-11 14:20:08 +01:00
Laurent Destailleur
debc0480dd
CSS
2017-11-10 20:20:59 +01:00
Laurent Destailleur
a029b16795
css
2017-11-10 18:27:03 +01:00
Laurent Destailleur
cb03b2f307
NEW Can sort joined files on thirdparty and user card.
2017-11-10 18:14:29 +01:00
Regis Houssin
3ffe1b6725
Fix: missing status 3 (only on form)
2017-11-10 16:51:37 +01:00
Laurent Destailleur
beacf4225f
Work on filemanager
2017-11-10 15:44:43 +01:00
Laurent Destailleur
c2d7b88bdd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-11-10 13:51:59 +01:00
Laurent Destailleur
ab78007a54
Work on filemanager generic component
2017-11-10 13:45:38 +01:00
Laurent Destailleur
9d3cf8f217
Fix can use tooltip with popup even for column titles
2017-11-09 18:50:15 +01:00
Laurent Destailleur
f8a44431b5
Fix visibility of extrafields
2017-11-07 13:41:59 +01:00
Laurent Destailleur
bc79aced6c
Fix extrafields with column perms not filled are not visible
2017-11-07 12:33:13 +01:00
Laurent Destailleur
d90e3e88c2
NEW Add method executeCLI and a phpunit
2017-11-06 20:24:12 +01:00
Laurent Destailleur
c78c06776b
Fix bug reported by scrutinizer
2017-11-05 03:39:27 +01:00
Laurent Destailleur
cd70e1506b
Work on common core code
2017-11-03 17:20:08 +01:00
Laurent Destailleur
a346a1a5e9
Work on website module
2017-11-03 15:56:16 +01:00
Laurent Destailleur
fd86c470a8
FIX #7651 #7748 #7542
2017-11-02 13:47:29 +01:00
Laurent Destailleur
f26d970d58
Remove option MAIN_HTML5_PLACEHOLDER (on by default now)
2017-11-01 10:17:24 +01:00
Laurent Destailleur
9458c80c48
Work on reminders
2017-10-31 23:10:29 +01:00
Laurent Destailleur
bbe1c9c494
NEW Can download PDF document from the payment page
2017-10-30 00:45:47 +01:00
Laurent Destailleur
76b0e7ee5a
NEW Add option PROPOSAL/ORDER/INVOICE_ALLOW_EXTERNAL_DOWNLOAD
2017-10-29 21:24:54 +01:00
Laurent Destailleur
02cae88a8c
Fix date output
2017-10-29 17:50:50 +01:00
Laurent Destailleur
33aa0f3160
Code comment
2017-10-29 17:49:24 +01:00
Laurent Destailleur
d569218162
Fix 'separate' extrafields must be visible by default.
...
Sandardize name of list pages (must end with _list.php)
2017-10-29 11:23:20 +01:00
Laurent Destailleur
46f95e14fa
Fix select2 search
2017-10-28 17:34:46 +02:00
Laurent Destailleur
00db7e16ec
Clean code
2017-10-28 16:00:07 +02:00
Laurent Destailleur
9283aaf6aa
Fix scrutinizer
2017-10-27 00:07:58 +02:00
Laurent Destailleur
a1f862eba6
NEW Enhance framework so we can use html/icons into SELECT options.
2017-10-26 20:06:23 +02:00
Laurent Destailleur
89baa0b307
Work on website
2017-10-26 14:49:30 +02:00
Laurent Destailleur
82b333e423
Fix migration to select2 4.0.5
2017-10-26 14:06:23 +02:00
Laurent Destailleur
6d6c4bf088
Fix export web site
2017-10-26 10:43:47 +02:00
Laurent Destailleur
e865f41b86
NEW Extrafields "link to object" now use a combo selection and getNomUrl
2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1
Work on modulebuilder and website module
2017-10-26 01:02:13 +02:00
Laurent Destailleur
ff9a6ca01b
Work on module builder
2017-10-25 22:23:54 +02:00
Laurent Destailleur
202712be94
Work on module builder
2017-10-25 22:02:07 +02:00
Laurent Destailleur
bb996019c2
NEW Support visibility on extrafields
2017-10-25 11:42:14 +02:00
Laurent Destailleur
f381361c8b
Work on modulebuilder
2017-10-24 19:57:36 +02:00
Laurent Destailleur
0b120dd1a9
Prepare code to remove hooks on extrafield update
2017-10-24 18:45:34 +02:00
Laurent Destailleur
d3f2e19691
Merge pull request #7680 from Nicos-git/OdtGeneration
...
NEW Add product unit fields for ODT substitution
2017-10-22 04:14:17 +02:00
Laurent Destailleur
ba2dd953b4
Update commondocgenerator.class.php
2017-10-22 04:13:49 +02:00
Laurent Destailleur
764e215ca1
Update commondocgenerator.class.php
2017-10-22 04:12:46 +02:00
Laurent Destailleur
b9c0ea3691
Update commondocgenerator.class.php
2017-10-22 04:07:54 +02:00
Laurent Destailleur
5984222794
FIX #7679
2017-10-22 03:47:36 +02:00
Nicolas Leichtle
fc2a834e41
New Add product unit fields for ODT substitution
2017-10-21 23:54:49 +02:00
Laurent Destailleur
dbcf3ddbe8
NEW Upgrade jquery select2 to 4.0.4
2017-10-21 19:05:24 +02:00
Laurent Destailleur
19a5780f7f
Clean code
2017-10-20 23:49:20 +02:00
Laurent Destailleur
5c189449e1
Move default value for user expense report on tab expense report
2017-10-20 17:02:26 +02:00
Laurent Destailleur
f67350db72
Merge pull request #7647 from BackrndSource/patch-2
...
FIX: Some errors from html.form.class.php not translated on fourn/commande/card.php
2017-10-19 19:19:21 +02:00
Laurent Destailleur
9c45e86a1c
Introduce main_doc into table of objects to know what is main doc.
...
Work on option PROPOSAL_USE_ONLINE_SIGN
2017-10-19 11:40:40 +02:00
Laurent Destailleur
cfeab01996
Prefill hour/min to 23:59 when creating a task
2017-10-18 18:50:30 +02:00
Laurent Destailleur
8b140ab069
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-17 10:44:29 +02:00
Laurent Destailleur
eb1fdca157
NEW Can create intervention from a proposal
2017-10-17 10:44:18 +02:00
BackrndSource
df388df3ff
Update html.form.class.php
...
$lang->load('errors') is needed to load the traductions for:
$return.= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';
$return.= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';
2017-10-16 22:56:16 +02:00
Laurent Destailleur
768c623a89
Merge pull request #7644 from atm-florian/dev_extrafield_default_value
...
FIX : Extrafield default value admin/defaultvalues.php enabled
2017-10-16 21:42:50 +02:00
florian HENRY
51ce8bf2a5
js
2017-10-16 21:08:09 +02:00
florian HENRY
17db813a4e
Logical variable name suffix/prefix
2017-10-16 21:05:12 +02:00
florian HENRY
695740142a
FIX : Extrafield default value admin/defaultvalues.php enabled
2017-10-16 20:54:53 +02:00
Laurent Destailleur
ebe0664aff
Merge branch 'develop' into scrutinizer-patch-3
2017-10-16 20:54:15 +02:00
Laurent Destailleur
f7fe011e98
Add CRLF before 'boundary' word. Use \r\n on wordwrap.
2017-10-16 14:31:28 +02:00
Rui Strecht
447cc208fe
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/societe/class/societe.class.php
2017-10-16 09:34:24 +01:00
Laurent Destailleur
afdc176f47
Fix scrutinizer
2017-10-16 08:52:00 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-16 06:47:05 +00:00
Laurent Destailleur
ab280feaa5
Move datepicker vars into lib_heas.js.php
2017-10-13 22:37:46 +02:00
Laurent Destailleur
4296df45af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/projet/list.php
htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
5092c41d94
Look and feel v6
2017-10-13 20:04:11 +02:00
Laurent Destailleur
8b64f979ef
Fix multiple upload was broken
2017-10-13 15:49:39 +02:00
Laurent Destailleur
5f22afa450
Merge pull request #7621 from atm-ph/fix_distinct_credit_note
...
Fix distinct credit note select list
2017-10-13 13:32:04 +02:00
Scrutinizer Auto-Fixer
165741517e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-13 11:28:26 +00:00
Laurent Destailleur
d12019d1b5
Fix from scrutinizer
2017-10-13 13:10:36 +02:00
Laurent Destailleur
8113321062
Start to work on email sender profiles
2017-10-13 12:02:26 +02:00
Laurent Destailleur
2b55fb81b9
Standardize substition keys.
2017-10-13 10:35:21 +02:00
atm-ph
bab43b043e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-10-13 09:52:56 +02:00
atm-ph
647c4036cf
Fix simplification of code
2017-10-13 09:21:37 +02:00
Laurent Destailleur
558f261b60
FIX #7593
2017-10-13 01:03:33 +02:00
atm-ph
8d3df7ea57
Fix can not distinct which credit note are in select list
2017-10-12 09:59:25 +02:00
Laurent Destailleur
0d0030cff4
Fix use of sender profiles
2017-10-11 19:57:53 +02:00
Laurent Destailleur
56be9e2b60
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:45 +02:00
Laurent Destailleur
bcf56e3140
Introduce table c_email_senderprofile to have several profils
2017-10-11 19:41:19 +02:00
Laurent Destailleur
efac9ddb12
Merge pull request #7613 from hregis/develop_extrafields
...
Fix: label not translated if special lang file used
2017-10-11 11:58:44 +02:00
Laurent Destailleur
eb995bb7ad
Merge pull request #7603 from hregis/develop_bug5
...
Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)
2017-10-11 11:48:46 +02:00
Laurent Destailleur
e644f7df58
Merge pull request #7597 from hregis/develop_member
...
NEW add company alias name when create company from member
2017-10-11 11:31:55 +02:00
Regis Houssin
7e79c3a795
Fix: label not translated if special lang file used
2017-10-11 10:10:27 +02:00
Regis Houssin
9ff0855812
Fix: datepicker.js.php is needed for the translation !!
2017-10-10 10:04:16 +02:00
Regis Houssin
88e700ae12
Fix: add month names short
2017-10-10 09:30:07 +02:00
Regis Houssin
f51c0db705
NEW add translation and possibility to change month and year
2017-10-10 09:16:14 +02:00
Regis Houssin
00db16e0de
Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)
2017-10-10 08:49:00 +02:00
Regis Houssin
625e440653
Fix: wrong test
2017-10-09 16:50:20 +02:00
Regis Houssin
86c301f197
Fix: uniformize parameters
2017-10-09 15:49:10 +02:00
Regis Houssin
16b766182c
NEW view company name if different of fullname in dol_banner
2017-10-09 15:35:08 +02:00
Laurent Destailleur
8f24a86352
NEW If max nb of generation is reached, date for next gen is striked
2017-10-09 14:16:22 +02:00
Rui Strecht
6c0cb31c08
Fixed issue with merge error
2017-10-09 11:44:10 +01:00
Regis Houssin
f2d9288db5
NEW add company alias name when create company from member
2017-10-09 12:38:44 +02:00
Rui Strecht
1a5cdf2406
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
# Conflicts:
# htdocs/admin/company.php
# htdocs/core/class/commonobject.class.php
2017-10-09 11:36:38 +01:00
Laurent Destailleur
3e0ccd6312
FIX #7585
2017-10-09 10:43:19 +02:00
Laurent Destailleur
67c33840cf
Code comment
2017-10-08 23:19:19 +02:00
Laurent Destailleur
33624e1001
NEW Attaching doc automatically in email is now a parameter of template.
2017-10-08 16:34:42 +02:00
Scrutinizer Auto-Fixer
328d39bc71
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
de71de61af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 18:52:38 +02:00
Laurent Destailleur
df38f60617
Export website into zip
2017-10-06 18:29:18 +02:00
Laurent Destailleur
8d47969d29
Merge pull request #7578 from OPEN-DSI/fix_0002
...
NEW add a new notification for the signed closed event of a proposal.
2017-10-06 17:36:23 +02:00
Laurent Destailleur
c7a0f467cc
Fix var unknown
2017-10-06 17:03:32 +02:00
KHELIFA
88ab3a9cab
Add a new notification for the event that has successfully closed a proposal.
2017-10-06 16:15:40 +02:00
Laurent Destailleur
43d85af5ae
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 15:23:10 +02:00
Laurent Destailleur
f9d9642340
FIX #6981
2017-10-06 14:07:28 +02:00
Laurent Destailleur
8ce723b4c9
FIX #7514
2017-10-06 13:56:54 +02:00
Laurent Destailleur
2d549a6191
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-10-06 13:09:42 +02:00
Laurent Destailleur
4bc7eb0ec1
Merge pull request #7520 from hregis/develop_ldap
...
Fix: Set LDAP password when LDAP key changed
2017-10-06 13:09:28 +02:00
Laurent Destailleur
2148622d40
Clean code
2017-10-06 12:55:48 +02:00
Inovea Conseil
2f3f04c2b1
Add constant to manage update_price function
...
Some external module want no update price after a trigger because they have a other method to calculate the total (ex: with a extrafield).
2017-10-06 10:42:25 +02:00
Laurent Destailleur
801a5180d6
Fix scrutinizer bug reports
2017-10-06 01:16:19 +02:00
Laurent Destailleur
2a2cd30e19
Fix code
2017-10-05 10:00:43 +02:00
Regis Houssin
8a79198769
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/core/class/comment.class.php
2017-10-04 20:00:39 +02:00
Laurent Destailleur
6540bc0061
Fix doxygen
2017-10-04 19:48:11 +02:00
Laurent Destailleur
ded55f41fb
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
2017-10-04 16:08:22 +02:00
Laurent Destailleur
13cb806436
FIX #7531 #7537
2017-10-04 15:18:15 +02:00
Regis Houssin
c563c3d3ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 13:19:07 +02:00
Regis Houssin
537fc63da5
Fix: add by error
2017-10-04 13:18:48 +02:00
Laurent Destailleur
85606126a9
Standardize code for events
2017-10-04 12:58:13 +02:00
Regis Houssin
a259057dd3
Fix: Found non escaped string
2017-10-04 12:42:41 +02:00
Regis Houssin
a124f47dcd
Fix: PHPCS
2017-10-04 12:07:17 +02:00
Regis Houssin
66ad30feb0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 11:23:50 +02:00
Regis Houssin
723bc4d436
NEW add ldap_rename for avoid password if ldap key changed
2017-10-04 11:22:41 +02:00
Laurent Destailleur
75a7e086b3
Merge pull request #7427 from atm-arnaud/NEW_comment_generic_element
...
New comment generic element
2017-10-04 11:13:39 +02:00
Regis Houssin
8d3ad9ddc8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-10-04 08:43:07 +02:00
Laurent Destailleur
a6cf934973
Add log
2017-10-04 02:46:01 +02:00
Laurent Destailleur
eeb36464b7
Merge pull request #7524 from hregis/develop_mc
...
Fix: command not found with escapeshellarg !
2017-10-03 18:06:49 +02:00
Laurent Destailleur
c22cd1cfe9
Fix test on entity must always be done using the "IN" instead of "="
2017-10-03 17:41:22 +02:00
Regis Houssin
a88938ace4
Fix: use GETPOST
2017-10-03 17:11:42 +02:00
Regis Houssin
9c2d053f74
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-10-03 17:01:39 +02:00
Regis Houssin
09e71f1390
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-10-02 11:51:27 +02:00
Regis Houssin
c1b6f59c1b
Fix: restore possible ldap keys
2017-10-02 08:43:53 +02:00
Laurent Destailleur
6dbc02022f
Merge pull request #7529 from Nicos-git/develop
...
NEW: Add project related fields to ODT
2017-10-02 00:36:46 +02:00
Laurent Destailleur
48c3d0e3f2
Update commondocgenerator.class.php
2017-10-02 00:36:15 +02:00
Laurent Destailleur
f15ce54c05
Update commondocgenerator.class.php
2017-10-02 00:34:55 +02:00
Laurent Destailleur
a81d458829
Merge pull request #7509 from dolibarr95/patch-21
...
NEW Add the attribute accept to the input form for file upload
2017-10-02 00:12:03 +02:00
Laurent Destailleur
e23a88732e
Fix default value on extrafields
2017-09-30 20:05:34 +02:00
Laurent Destailleur
a43dcbd0c5
Fix no "now" link on search of a date extrafield in list
2017-09-30 18:57:21 +02:00
Laurent Destailleur
976cbd5f83
Fix javascript error and input field for password extrafield in list
2017-09-30 18:52:33 +02:00
Nicolas Leichtle
95cc007b39
NEW: Add project related fields to ODT
2017-09-30 15:40:17 +02:00
Laurent Destailleur
0e15aef44f
CSS
2017-09-30 00:30:58 +02:00
Regis Houssin
9490e13c21
Fix: command not found with escapeshellarg !
2017-09-29 14:52:05 +02:00
Laurent Destailleur
f007f9e7e5
NEW Add new property visible dy default on lists on extrafields
2017-09-29 13:26:44 +02:00
Rui Strecht
4839d0f84d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-28 09:36:52 +01:00
Laurent Destailleur
e878f3cfd5
No more need of contacts on each tab by default
2017-09-27 20:15:56 +02:00
Laurent Destailleur
fdc1aa2a03
NEW Move contacts of a thirdparty on tab Contacts/Addresses
2017-09-27 19:56:03 +02:00
Regis Houssin
9823d6622c
Fix: use default $shared value
2017-09-27 17:40:02 +02:00
Regis Houssin
20684b4505
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/rapport/pdf_paiement.class.php
htdocs/core/modules/rapport/pdf_paiement_fourn.class.php
2017-09-27 17:22:18 +02:00
arnaud
f29ea35dc8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-27 14:56:52 +02:00
dolibarr95
00862913d8
Add the attribute accept to input tag
...
I know this is not a security check but it is more convenient for the user when in a form only images or pdf are accepted for example.
see :
*https://www.w3.org/wiki/HTML/Elements/input/file
*https://www.w3schools.com/TagS/att_input_accept.asp
Hope every body needs it.
tks
2017-09-27 11:12:38 +02:00
Rui Strecht
3ebb18ab16
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-26 16:34:59 +01:00
Laurent Destailleur
d7dd6ed334
Fix undefined var
2017-09-26 16:15:22 +02:00
Laurent Destailleur
d1bee67b40
FIX #3991
2017-09-26 13:09:19 +02:00
Laurent Destailleur
c9e9f60f8f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-09-25 19:55:52 +02:00
Laurent Destailleur
919d29fdf7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2017-09-25 19:45:40 +02:00
Laurent Destailleur
fe55feb82f
FIX #7461
2017-09-25 19:45:01 +02:00
Laurent Destailleur
dc362fcd30
NEW Can show currency in list of bank accounts
2017-09-25 18:11:03 +02:00
Inovea Conseil
35ae0e435d
Fix quote in input
...
Delete a quote in input field
2017-09-25 16:14:14 +02:00
Laurent Destailleur
7b9facc76a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-25 11:43:12 +02:00
Laurent Destailleur
a9fabf117e
Code comment
2017-09-25 11:42:59 +02:00
Laurent Destailleur
53d931dd11
Merge pull request #7481 from dolibarr95/patch-17
...
Fix 7470
2017-09-25 11:34:00 +02:00
dolibarr95
6ee15f1c45
Fix 7470
...
php warning when MAIN_MODULE_xxxxx_DIR exists but the module does not have a directory.
2017-09-25 09:01:47 +02:00
Regis Houssin
d592664150
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-09-25 06:48:26 +02:00
Regis Houssin
92ff974c5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-25 06:47:34 +02:00
Laurent Destailleur
934edd9f5a
Merge branch 'develop' into 6.0-api
2017-09-24 22:01:07 +02:00
Laurent Destailleur
2285e9bc0b
Merge branch 'develop' into develop_trad
2017-09-24 21:47:17 +02:00
Laurent Destailleur
971e59395c
Fix phpcs
2017-09-24 21:46:14 +02:00
Laurent Destailleur
4246cf24f3
Perf enhancement: Remove one include of js.
2017-09-24 20:36:27 +02:00
Regis Houssin
06ee9f4775
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-24 16:10:55 +02:00
Regis Houssin
0cdca6f3eb
Fix: phpcs error
2017-09-24 11:10:33 +02:00
Laurent Destailleur
91d303465d
NEW Can add html content on right of tabs
2017-09-24 01:39:06 +02:00
Laurent Destailleur
414f633e75
Fix css
2017-09-23 12:59:49 +02:00
Regis Houssin
791c385e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ldap
Conflicts:
htdocs/adherents/card.php
2017-09-22 20:26:22 +02:00
Laurent Destailleur
63ec14e47d
Convert sode to send member info email into new generic email template
...
system.
2017-09-22 20:18:11 +02:00
Laurent Destailleur
f990667b1a
NEW Can send email from the member card using email templates.
2017-09-22 17:48:38 +02:00
Laurent Destailleur
8578a1b825
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 17:04:26 +02:00
Laurent Destailleur
6d7db96359
NEW Option "one email per recipient" when using bulk actions emails.
2017-09-22 16:31:05 +02:00
Laurent Destailleur
252f038468
Mutualize code of substitutions for emails
2017-09-22 14:34:31 +02:00
Laurent Destailleur
bd45ea5a03
Split page for invoice template into card + list. Add more filters.
2017-09-22 11:28:53 +02:00
Regis Houssin
1314e00bc6
Fix: check if array and check empty value if required
2017-09-20 14:46:51 +02:00
Rui Strecht
395100ca70
Added missing comments for new function parameters, removed unused parameter $searchlabel
2017-09-20 12:45:18 +01:00
Rui Strecht
24f8ea003a
Added self to contributors list
2017-09-20 12:30:59 +01:00
Rui Strecht
42a57aab26
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
2017-09-20 12:16:09 +01:00
Rui Strecht
f1126b65bf
Updated method to fetch state name, code and id to match method used with country
...
Reverted some previous changes to allow backwards compatibility
Extended MAIN_SHOW_REGION_IN_STATE to include showing region in thirdparty card
2017-09-20 12:06:35 +01:00
Regis Houssin
1f59e4f7e9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-20 12:47:35 +02:00
Laurent Destailleur
8dfa87fcf6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-19 19:30:28 +02:00
Laurent Destailleur
c38ed54990
Disable old datepicker
2017-09-19 17:31:37 +02:00
atm-quentin
815d0aff90
FIX for free line select unit was wrong
2017-09-19 15:10:18 +02:00
Laurent Destailleur
f936b17d68
FIX Protection to avoid to apply credit note discount > remain to pay
2017-09-19 00:24:52 +02:00
Rui Strecht
998eea09bd
Added new option MAIN_SHOW_STATE_CODE (on/off; 1/0) to show state code in select fields options and values.
...
Changed option MAIN_SHOW_REGION_IN_STATE to on/off - 1/0 and to mix with the new MAIN_SHOW_STATE_CODE (can show region name and state code)
2017-09-18 16:48:13 +01:00
arnaud
e7bb7a3588
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_comment_generic_element
2017-09-18 17:28:03 +02:00
arnaud
9795f48046
NEW comment system working with all objects
2017-09-18 17:27:29 +02:00
Laurent Destailleur
da6b1e92b2
NEW Add the total in the perday view of the time spent form.
2017-09-18 14:18:34 +02:00
Regis Houssin
f550e27579
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-18 12:15:01 +02:00
Regis Houssin
a03ef95eaa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/tables/llx_c_payment_term.sql
2017-09-18 09:11:04 +02:00
Laurent Destailleur
3f7b705674
Use correct term accounting for codes
2017-09-18 00:48:09 +02:00
Laurent Destailleur
ee774f1bf9
FIX Calculation in the activity box
2017-09-17 20:20:48 +02:00
Laurent Destailleur
9dbd88f0ba
FIX Calculation in the activity box
2017-09-17 20:17:51 +02:00
Laurent Destailleur
fa18e788b5
Fix must use photo of user
2017-09-17 17:29:00 +02:00
Laurent Destailleur
ab5724e7ff
Mutualize code for forms to send emails. Remove thousand line of code.
2017-09-17 17:12:14 +02:00
Regis Houssin
d9b3a4e456
Fix: phpcs
2017-09-16 21:58:05 +02:00
Regis Houssin
bdc425c203
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2017-09-16 21:41:55 +02:00
Regis Houssin
87b81fb2fd
NEW add members types ldap group management
2017-09-16 21:41:30 +02:00
Laurent Destailleur
b4eab24490
Add project into list of customer orders
2017-09-16 20:32:28 +02:00
Laurent Destailleur
0fec777d0e
NEW On bulk email from a list, can uncheck "Join main document".
...
NEW Show direct preview link on contract
2017-09-16 18:31:30 +02:00
Regis Houssin
4ab1f68102
Fix: check connectivity for avoid ldap errors
2017-09-16 17:12:51 +02:00
Laurent Destailleur
630dc92a13
NEW Mass PDF Merging is available on contracts
2017-09-16 15:39:52 +02:00
Laurent Destailleur
e56b41c1ae
Clean code
2017-09-16 13:28:13 +02:00
Laurent Destailleur
0cf67944fa
Clean code
2017-09-16 13:14:46 +02:00
Laurent Destailleur
bd7c4fe940
NEW Summary of last events on a card are sorted on decreasing date.
2017-09-16 10:12:44 +02:00
Laurent Destailleur
8986640a10
FIX Responsive
2017-09-16 09:16:05 +02:00
Laurent Destailleur
4e7e6cc658
Fix W3C
2017-09-16 09:15:10 +02:00
Laurent Destailleur
baa32f6ed8
FIX Responsive
2017-09-16 09:13:57 +02:00
Laurent Destailleur
961d475a9d
More complete substitution system.
...
Add __CONTRACT_NEXT_EXPIRATION_DATE__ and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
2017-09-16 03:45:29 +02:00
Laurent Destailleur
a4086b52ef
NEW Can send email from contract card
2017-09-16 01:34:15 +02:00
Laurent Destailleur
b13dbf1f06
Clean code. Make selection of template working even if public.
2017-09-16 00:49:46 +02:00
Regis Houssin
767240698f
Fix: wrong var name
2017-09-15 18:31:22 +02:00
Regis Houssin
7f57f737b3
New: Ping ldap server before ldap_connect for avoid waiting
2017-09-15 18:02:52 +02:00
Regis Houssin
db17eb80ec
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/class/paymentterm.class.php
2017-09-15 16:45:49 +02:00
Laurent Destailleur
5e34b121dd
Add more robust php unit to detect not escaped sql. Fix not escaped sql
2017-09-15 15:41:07 +02:00
Laurent Destailleur
77056d9adb
NEW All setup of accountancy can be done from menu "Accountancy-Setup"
2017-09-15 14:09:42 +02:00
Laurent Destailleur
1a78e2a055
Mutualize/share code of all payments modes
2017-09-15 13:43:16 +02:00
Laurent Destailleur
0ade500535
Better support of text editor when no js available.
2017-09-15 11:19:56 +02:00
Laurent Destailleur
3b40c95107
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
2017-09-14 21:57:14 +02:00
Laurent Destailleur
c52e593ea8
Fix this->db
2017-09-14 21:27:14 +02:00
Laurent Destailleur
2f80618545
Merge pull request #7390 from atm-arnaud/FIX_task_comment_design
...
Fix task comment design
2017-09-14 12:21:58 +02:00
Laurent Destailleur
ed9c401ca6
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 12:20:26 +02:00
Laurent Destailleur
b80b7bbcb9
Merge pull request #7384 from atm-ph/fix_6.0_get_class_self
...
Fix get_class(self) instead of get_class($this)
2017-09-14 12:16:16 +02:00
Laurent Destailleur
f2d092c815
Merge pull request #7377 from hregis/6.0_bug2
...
Fix: missing select2 combobox
2017-09-14 12:08:28 +02:00
Regis Houssin
a494e01f00
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-14 12:07:19 +02:00
Laurent Destailleur
74b55d8e8d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-14 11:49:43 +02:00
Laurent Destailleur
ed013c1b7e
Compatibilty php 7.2
2017-09-14 10:21:04 +02:00
Laurent Destailleur
eadfbfe2bd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/lib/functions2.lib.php
2017-09-13 20:57:53 +02:00
Laurent Destailleur
9b22f046f5
FIX multicompany better accuracy in rounding and with revenue stamp.
2017-09-13 19:31:32 +02:00
Laurent Destailleur
a5a08006e9
FIX multicompany better accuracy in rounding and with revenue stamp.
2017-09-13 19:27:21 +02:00
Laurent Destailleur
c44a5ede43
FIX Several problem with the last event box on project/tasks
...
Conflicts:
htdocs/core/lib/functions2.lib.php
2017-09-13 15:16:06 +02:00
Laurent Destailleur
7767ac2aa7
FIX Several problem with the last event box on project/tasks
2017-09-13 15:12:54 +02:00
arnaud
4b6553d360
FIX comment color and create colorIsLight function
2017-09-13 10:43:44 +02:00
Laurent Destailleur
2cdea7e37c
Fix bug reported by scrutinizer
2017-09-12 19:21:26 +02:00
atm-ph
30eb03af4c
Fix get_class(self) instead of get_class($this)
2017-09-12 16:36:14 +02:00
Laurent Destailleur
a4665e17d4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/compta/facture/class/facture-rec.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/societe/class/societe.class.php
htdocs/societe/list.php
2017-09-12 13:26:25 +02:00
Regis Houssin
e038e1a2f5
Fix: missing select2 combobox
2017-09-12 09:27:59 +02:00
Laurent Destailleur
44405e5415
Fix #7335 #7365 Better fix
2017-09-11 15:04:29 +02:00
Laurent Destailleur
dcc9cb4a16
Some fixes in various payment
2017-09-11 14:29:27 +02:00
Laurent Destailleur
029f1c411f
Merge pull request #7357 from hregis/6.0_medias
...
Fix: some problems with medias in multicompany
2017-09-11 14:13:51 +02:00
Regis Houssin
b5de8da3a6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/modules/modFacture.class.php
2017-09-11 08:07:55 +02:00
Laurent Destailleur
d13c4b7b84
Better autosize of extrafields
2017-09-11 01:05:55 +02:00
Laurent Destailleur
25ec124411
Better autosize of extrafields
2017-09-11 00:19:42 +02:00
Laurent Destailleur
e7abb39ee2
NEW Template invoices are visible on the customer tab
2017-09-10 19:28:20 +02:00
Regis Houssin
762b4eb876
Fix: some problems with medias in multicompany
2017-09-09 17:48:04 +02:00
Laurent Destailleur
4f52871c67
Merge pull request #7345 from AXeL-dev/develop
...
fix hidepriceinlabel when using ajax autocompleter
2017-09-08 21:22:38 +02:00
Laurent Destailleur
75172966c2
Fix selection of email templates
2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
2017-09-08 13:30:54 +02:00
Laurent Destailleur
03fe9d4e97
Escape all status
2017-09-08 13:23:12 +02:00
Laurent Destailleur
b7197530c2
NEW Each user can edit its own email template (menu tools)
2017-09-08 12:48:01 +02:00
AXeL-dev
a615a46a5a
fix hidepricelabel when using ajax autocompleter
2017-09-08 11:06:55 +01:00
Regis Houssin
66e548427c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/resultat/clientfourn.php
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-09-07 10:50:35 +02:00
Laurent Destailleur
61ee071f43
Fix regression
2017-09-04 10:17:51 +02:00
Laurent Destailleur
2c3a696b78
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-09-04 10:16:02 +02:00
Laurent Destailleur
f3b1f89bae
Fix warning
2017-09-03 15:21:37 +02:00
Laurent Destailleur
f963afa505
Fix warning
2017-09-03 15:21:17 +02:00
Laurent Destailleur
3126676ffb
FIX inert of extra field must not change extrafield values in memory
2017-09-03 14:27:46 +02:00
Laurent Destailleur
c6cbf2345d
FIX Management of default value in extrafields when default is '0'
2017-09-03 14:25:54 +02:00
Laurent Destailleur
a4d3e48773
FIX inert of extra field must not change extrafield values in memory
2017-09-03 12:40:49 +02:00
Laurent Destailleur
3beee569a6
Enhance support of default value in extrafields
2017-09-02 15:18:41 +02:00
Laurent Destailleur
9923c87fd8
Fix translation of extrafields
2017-09-02 13:03:14 +02:00
Laurent Destailleur
36eb21c135
Fix translation of extrafields
2017-09-02 13:02:01 +02:00
Laurent Destailleur
e5400a4a36
Fix translation of extrafields
2017-09-02 13:01:41 +02:00
Laurent Destailleur
7f7b4cddb4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-09-02 12:37:02 +02:00
Laurent Destailleur
015bc51c43
Fix regression adding a false error message
2017-09-02 12:17:29 +02:00
Laurent Destailleur
32c6acefd2
Merge pull request #7321 from ruistrecht-alt/NEW_Add_region_to_state/province_form_field
...
NEW Added Region name to state/province form field
2017-09-02 00:10:25 +02:00
Rui Strecht
1ee0077e4e
Fix: Added name to contributors
2017-09-01 16:10:19 +01:00
Laurent Destailleur
4660bc58fc
Fix nostop option
2017-09-01 17:08:47 +02:00
Laurent Destailleur
bda507d191
Fix nostop option
2017-09-01 17:07:26 +02:00
Laurent Destailleur
223e1b1cd4
Fix missing the nostop tag
2017-09-01 16:55:09 +02:00
Laurent Destailleur
920d6270c3
Fix missing the nostop tag
2017-09-01 16:54:06 +02:00
Rui Strecht
9443cb0c1b
NEW Added Region name to state/province form field
2017-09-01 15:53:06 +01:00
Laurent Destailleur
2768878618
FIX Bad condition on sms log debug
2017-09-01 16:39:49 +02:00
Laurent Destailleur
e663314cb1
Clean code
2017-09-01 16:38:56 +02:00
Laurent Destailleur
c02355c8c3
FIX Bad condition on sms log debug
2017-09-01 16:37:45 +02:00
Laurent Destailleur
61cf69f2bb
NEW Include a color syntaxed HTML editor for emailing edition.
2017-09-01 13:09:13 +02:00
Maxime Kohlhaas
cf49c274a6
Better fix
2017-09-01 10:38:50 +02:00
Maxime Kohlhaas
1a956cce9a
Fix : insert line extrafield
2017-09-01 10:31:22 +02:00
atm-ph
8188abd4cd
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-08-31 11:09:02 +02:00
Laurent Destailleur
9146bb336e
Work on merging all payment modes in one page
2017-08-31 03:34:57 +02:00
Regis Houssin
8e8f94df11
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/facture/card.php
htdocs/compta/facture/class/facture-rec.class.php
2017-08-30 19:33:23 +02:00
Laurent Destailleur
a60cd49fb0
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
2017-08-28 12:53:02 +02:00
Laurent Destailleur
075a138e14
Fix substitution of __EMAIL__
2017-08-28 12:49:57 +02:00
Laurent Destailleur
c382ca22b8
FIX link in to email and option for tls
2017-08-28 00:09:21 +02:00
Laurent Destailleur
b12800d174
FIX link in to email and option for tls
2017-08-28 00:06:19 +02:00
Laurent Destailleur
502ac19a0a
Fix regression on categories
2017-08-27 12:28:59 +02:00
Laurent Destailleur
3f7eea2e0a
NEW Can set language on extrafields
2017-08-27 12:12:02 +02:00
Laurent Destailleur
c573df4f0e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/card.php
2017-08-26 22:33:56 +02:00
Laurent Destailleur
782b85ba13
Merge pull request #7285 from hregis/6.0_bug
...
Fix: avoid error "A non-numeric value encountered"
2017-08-26 19:31:16 +02:00
Laurent Destailleur
7329d21dcd
Fix lang selection
2017-08-25 17:13:33 +02:00
Laurent Destailleur
9d380a8b8a
NEW Can edit the language into the email templates editor.
2017-08-25 16:38:45 +02:00
Laurent Destailleur
4337001418
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/societe/list.php
2017-08-24 14:26:45 +02:00
Laurent Destailleur
8e6546497a
Code comment
2017-08-24 13:43:36 +02:00
Laurent Destailleur
326d3df63f
FIX select of category
...
FIX pb with extrafield list and key '0'
Conflicts:
htdocs/core/class/extrafields.class.php
2017-08-24 13:28:56 +02:00
Laurent Destailleur
7da6f93d7e
FIX select of category
...
FIX pb with extrafield list and key '0'
2017-08-24 13:23:15 +02:00
Laurent Destailleur
17f44ad980
NEW Can make a specific setup for SMTP sending for emailing module
2017-08-24 02:02:00 +02:00
Regis Houssin
1befd9c67f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-23 21:05:36 +02:00
Regis Houssin
7da1b215f3
Fix: avoid error "A non-numeric value encountered"
2017-08-23 21:01:14 +02:00
Laurent Destailleur
ab37794f61
Fix text
2017-08-23 19:34:26 +02:00
Laurent Destailleur
90afbcb034
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/bank.php
htdocs/core/lib/functions.lib.php
2017-08-23 17:02:53 +02:00
Laurent Destailleur
f3ef6448d7
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/admin/supplier_payment.php
htdocs/core/lib/ajax.lib.php
htdocs/don/admin/donation.php
htdocs/product/admin/product.php
2017-08-23 16:11:51 +02:00
Laurent Destailleur
4da49dfc2d
FIX #7239
2017-08-23 15:02:38 +02:00
Regis Houssin
2f537a1ade
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/compta/charges/index.php
htdocs/compta/paiement/list.php
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2017-08-22 18:49:40 +02:00
Laurent Destailleur
e05ac34966
Fix remove var_dump
2017-08-22 18:03:37 +02:00
Laurent Destailleur
64c4f899f3
Fix charset management with ace
2017-08-22 18:00:54 +02:00
Laurent Destailleur
db9cc4683a
Fix php warning
2017-08-22 15:29:40 +02:00
Laurent Destailleur
14cd150762
NEW Introduce experimental feature to search dolistore from application
2017-08-22 14:47:01 +02:00
Laurent Destailleur
30c39d246b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-08-22 11:18:56 +02:00
Laurent Destailleur
731f826a55
NEW jquery date selector become default date selector
2017-08-22 09:23:35 +02:00
Laurent Destailleur
2321091170
NEW Move the upload input on top right in ECM module
2017-08-20 21:23:19 +02:00
Laurent Destailleur
188653a85d
Work on website module
2017-08-20 18:50:51 +02:00
Laurent Destailleur
260beed512
NEW Generated files are now indexed in database
2017-08-18 23:19:55 +02:00
Laurent Destailleur
097b660c41
Mutualize code
2017-08-18 16:25:00 +02:00
florian HENRY
874d61bb6d
Other fix
2017-08-18 11:35:20 +02:00
florian HENRY
c793e847bc
fix comondoc generator
2017-08-18 11:30:13 +02:00
florian HENRY
f6a1e7685c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_manageextrafieldswithmultientity
2017-08-04 17:13:53 +02:00
florian HENRY
03e935f493
Better management
2017-08-04 17:11:40 +02:00
Laurent Destailleur
1bd992dae9
Merge pull request #7238 from atm-florian/dev_manageextrafieldswithmultientity
...
NEW : manageme extrafields with multientity
2017-08-04 15:39:31 +02:00
Laurent Destailleur
402e6bf650
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/card.php
htdocs/compta/bank/various_payment/index.php
htdocs/compta/paiement/list.php
htdocs/core/modules/modCron.class.php
2017-08-04 15:39:00 +02:00
Laurent Destailleur
da831d2c8e
FIX Bad link in ECM
2017-08-04 13:45:57 +02:00
Laurent Destailleur
5b7c144f95
FIX Bad link in ECM
2017-08-04 13:45:20 +02:00
Laurent Destailleur
c107a77722
NEW Can filter on document name in ECM module for automatic tree
2017-08-04 13:10:51 +02:00
Laurent Destailleur
3a098ca047
Reduce verbosity
2017-08-04 11:50:30 +02:00
florian HENRY
8fd45383e2
NEW : manageme extrafields with multientity
2017-08-04 09:00:11 +02:00
Laurent Destailleur
f058fa1938
Better detection if a module provide triggers
2017-08-03 12:19:31 +02:00
Laurent Destailleur
81b11100b0
Prepare code to clone site an fetch external page
2017-08-03 01:45:31 +02:00
Laurent Destailleur
fa752348c8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/various_payment/index.php
htdocs/contact/list.php
htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
5b1f5b0f20
Fix translation done twice into field title of array
2017-08-02 13:31:53 +02:00
Laurent Destailleur
71d49f1c6f
Fix pb in ecm
2017-08-01 18:44:34 +02:00
Laurent Destailleur
ba221650cf
Start to work on using the jquery date selector.
2017-08-01 01:25:30 +02:00
Regis Houssin
0dc0fe81fc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-31 07:40:01 +02:00
atm-ph
1f3f9e40b1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-27 16:01:53 +02:00
Laurent Destailleur
ec27eb5b1e
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contact/list.php
htdocs/societe/list.php
2017-07-27 02:09:40 +02:00
Laurent Destailleur
bdfb0b7561
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
2017-07-26 21:22:53 +02:00
Regis Houssin
acd5780e32
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-26 08:58:56 +02:00
Laurent Destailleur
760d2617a0
Can disable the search of previous/next in dol_banner
2017-07-25 23:03:28 +02:00
Laurent Destailleur
5b9ac2a7a9
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/index.php
2017-07-25 21:11:36 +02:00
Laurent Destailleur
c386a02889
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/langs/en_US/stocks.lang
2017-07-25 21:10:08 +02:00
Laurent Destailleur
8b793a261f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/DolibarrModules.class.php
2017-07-25 21:08:31 +02:00
Laurent Destailleur
6c9242b605
Merge pull request #7201 from atm-florian/dev_extrafields_table_uniformisation
...
NEW new columns into extrafields table to get update create information
2017-07-25 20:04:50 +02:00
Laurent Destailleur
0e23b04fab
Update extrafields.class.php
2017-07-25 20:04:10 +02:00
Laurent Destailleur
6e8498465a
Update extrafields.class.php
2017-07-25 20:01:47 +02:00
Laurent Destailleur
a7c96416ba
Merge pull request #7194 from hregis/6.0_bug2
...
Fix: getEntity $shared param value is now 1 by default
2017-07-25 13:29:42 +02:00
florian HENRY
d2ecebdddd
new :new column into extrafeild table to get update create information
2017-07-25 11:57:36 +02:00
Laurent Destailleur
dcf5fd20bb
Fix navigation on card generated by modulebuilder
2017-07-25 10:38:39 +02:00
Laurent Destailleur
bfd1fa3984
Enhance modulebuilder
2017-07-25 02:56:19 +02:00
Laurent Destailleur
13cd203502
Enhance modulebuilder
2017-07-25 01:54:54 +02:00
Laurent Destailleur
70341d6169
Debug modulebuilder
2017-07-25 00:33:43 +02:00
Laurent Destailleur
307b8ef4f6
Debug modulebuilder
2017-07-25 00:32:06 +02:00
Laurent Destailleur
1877a3b6fa
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-24 21:04:07 +02:00
Laurent Destailleur
dcb79e66cc
Debug modulebuilder
2017-07-24 13:55:12 +02:00
Regis Houssin
48800bc268
Fix: getEntity $shared param value is now 1 by default
2017-07-24 08:52:10 +02:00
Laurent Destailleur
6421ec3139
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/doleditor.class.php
2017-07-23 19:27:40 +02:00
Laurent Destailleur
25b107defb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/list.php
htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Laurent Destailleur
0aed9ecd7c
Fix ckeditor is now ok since there is no more jmobile.
2017-07-23 18:52:30 +02:00
Laurent Destailleur
336400d9ea
Can clone a page onto another website
2017-07-23 16:20:53 +02:00
Regis Houssin
2efb86b5d8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-23 10:36:14 +02:00
Laurent Destailleur
764c7ac792
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/websites/index.php
2017-07-22 20:46:02 +02:00
Laurent Destailleur
854a6ca3d5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-07-22 16:40:45 +02:00
Laurent Destailleur
340203cc18
Fix vat label for India
2017-07-22 16:05:51 +02:00
Regis Houssin
26df1389f4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-07-21 20:42:21 +02:00
Laurent Destailleur
d07741ada1
Merge branch 'develop' into patch-rib
2017-07-21 14:58:33 +02:00
Laurent Destailleur
6830fe4f91
Fix generic clone function
2017-07-21 13:39:06 +02:00
Laurent Destailleur
1e7aa4d9b4
Work on module website
2017-07-19 16:38:00 +02:00
Regis Houssin
c8bd11660d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-07-18 15:23:43 +02:00
Laurent Destailleur
a416ec4258
Try to fix travis
2017-07-18 14:25:07 +02:00
Laurent Destailleur
5c296c679e
Enhance source code editor
2017-07-18 13:42:07 +02:00
Laurent Destailleur
97fe41d603
A info int smtp header
2017-07-18 12:49:19 +02:00
Laurent Destailleur
6db2aeff20
Fix source code editor
2017-07-18 12:00:18 +02:00
Laurent Destailleur
2a50a78497
Fix hack to solve link to restrictions
2017-07-18 10:15:48 +02:00
Laurent Destailleur
98ef978b2a
NEW Introduce code syntax coloration with mode 'ace' for DolEditor.
2017-07-18 03:18:16 +02:00
Laurent Destailleur
4582b54e91
Fix use command standard @... to mark a change in official code
2017-07-17 20:09:19 +02:00
Laurent Destailleur
7b2a71802b
Do some TODO on modulebuilder module.
2017-07-16 13:00:35 +02:00
Regis Houssin
200f232164
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-16 07:51:20 +02:00
Laurent Destailleur
15cf15f47f
Look and feel v6
2017-07-14 02:07:01 +02:00
Laurent Destailleur
312b153005
Fix phpcs
2017-07-13 23:46:01 +02:00
Laurent Destailleur
43f6eab2ea
FIX #7146
2017-07-13 15:16:17 +02:00
Laurent Destailleur
c434f72d31
Merge pull request #7146 from hregis/6.0_bug3
...
Fix: travis error (categorie)
2017-07-13 14:46:41 +02:00
Laurent Destailleur
85d9a2f790
Merge pull request #7145 from hregis/6.0_bug2
...
Fix: missing group name with dol_banner_tab
2017-07-13 14:36:17 +02:00
Laurent Destailleur
23fbef3dae
Fix the delete dir functions does not return real nb of deleted files.
2017-07-13 00:26:05 +02:00
Laurent Destailleur
44b6b8cc65
Fix purge of log files was missing some log files.
2017-07-12 20:27:25 +02:00
Laurent Destailleur
a487492a7a
Fix purge of log files was missing some log files.
2017-07-12 20:23:35 +02:00
Regis Houssin
44a44ab0a2
Fix: travis error
2017-07-12 16:45:32 +02:00
Regis Houssin
d63e15f0c6
Fix: missing group name with dol_banner_tab
2017-07-12 15:52:58 +02:00
Laurent Destailleur
33ceb22b8b
Fix error management into modulebuilder
2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15
Debug modulebuilder
2017-07-12 11:52:07 +02:00
Regis Houssin
cb6b81d897
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-07-11 19:10:22 +02:00
Laurent Destailleur
c75db29ff2
Fix warning when module position is not correct
2017-07-11 12:54:49 +02:00
Laurent Destailleur
32d5edf5b9
Fix warning when module position is not correct
2017-07-11 12:54:03 +02:00
Laurent Destailleur
45d8fbb19e
Fix gravatar
2017-07-08 21:39:48 +02:00
Laurent Destailleur
f40afcf023
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/compta/facture/list.php
htdocs/compta/paiement/class/cpaiement.class.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/expensereport/card.php
htdocs/expensereport/class/expensereport.class.php
htdocs/product/stats/facture.php
2017-07-08 18:32:34 +02:00
Laurent Destailleur
cf6745b1ae
Debug module builder
2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888
Debug modulebuilder
2017-07-08 15:43:36 +02:00
Laurent Destailleur
252d8da8fc
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/class/categorie.class.php
htdocs/core/class/commondocgenerator.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
2017-07-07 15:11:53 +02:00
gauthier
a6f1e08c19
FIX : we have to check if contact doesn't already exist on add_contact() function
2017-07-07 11:48:30 +02:00
Laurent Destailleur
9baeee893f
Fix multicurrency (tags for odt)
2017-07-07 10:54:54 +02:00
phf
6ab0ec4b1b
Fix travis and rename 2 fields
2017-07-07 10:22:37 +02:00
Laurent Destailleur
2aaf8b22f2
Fix substitution var
2017-07-07 10:10:12 +02:00
phf
49b8689f2d
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-07-05 11:02:39 +02:00
phf
b8865c425f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report
2017-07-05 10:48:01 +02:00
phf
1beec51928
New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE
2017-07-05 10:44:52 +02:00
Regis Houssin
fa247ffd98
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-29 08:51:42 +02:00
Laurent Destailleur
ab0a730d4a
Fix bad GETPOST on 'action'
2017-06-29 02:54:56 +02:00
Laurent Destailleur
6f82837b0f
Fix GETPOST of lang_id
2017-06-27 17:27:01 +02:00
Laurent Destailleur
3fdfebf7ef
Fix position of top menu does not follow 'position' field.
2017-06-27 04:25:41 +02:00
Laurent Destailleur
59bd4749a8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
htdocs/product/class/product.class.php
2017-06-24 10:27:10 +02:00
Laurent Destailleur
1211e0d7ab
FIX vat code not saved during product creation.
2017-06-23 12:09:21 +02:00
Laurent Destailleur
693b2fe3b4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/ajax/ajaxdirpreview.php
htdocs/core/class/conf.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/tpl/objectline_create.tpl.php
2017-06-23 11:20:29 +02:00
Laurent Destailleur
3a400c46ad
Fix preselected email not done
2017-06-23 10:15:32 +02:00
Laurent Destailleur
1b96bb4221
Fix usage of constant. No need to have a dedicated setup as it should be
...
supported by the responsive design architecture.
2017-06-22 14:48:13 +02:00
Laurent Destailleur
474a2692fa
Fix missing /div
2017-06-22 13:54:03 +02:00
Laurent Destailleur
4102403482
Look and feel v6
2017-06-21 11:37:34 +02:00
Laurent Destailleur
3ec0e6f7ef
FIX #6885
2017-06-20 12:31:08 +02:00
Laurent Destailleur
d8b0199ba2
FIX #7040
2017-06-20 10:24:54 +02:00
Regis Houssin
909826e24f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-20 06:25:35 +02:00
Laurent Destailleur
658ba50aa8
Standardize picto status
2017-06-20 02:29:29 +02:00
Marcos García
eaaee59f92
FIX #6541 since 4.0.4 to 5.0.0 autofill zip/town not working
2017-06-19 19:23:00 +02:00
Regis Houssin
d2371946ba
Fix: for avoid warning
2017-06-19 09:50:13 +02:00
Regis Houssin
544d051fe3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-19 07:06:57 +02:00
Laurent Destailleur
86a6a83647
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/admin/tools/index.php
htdocs/bookmarks/bookmarks.lib.php
htdocs/compta/facture.php
htdocs/core/tpl/passwordforgotten.tpl.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/main.inc.php
htdocs/product/stats/card.php
htdocs/public/paypal/paymentko.php
2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6
Escape hml tags
2017-06-18 19:42:59 +02:00
Regis Houssin
dcc152d4a4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-18 06:52:20 +02:00
Laurent Destailleur
b73228899a
Merge pull request #7024 from defrance/patch-14
...
Introduce weight conversion lb & oz
2017-06-17 17:52:20 +02:00
BENKE Charlene
fcdf68db6a
Update commonobject.class.php
2017-06-17 16:31:54 +02:00
Regis Houssin
a0299042e4
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-17 12:05:33 +02:00
Laurent Destailleur
5b7a8e9c90
Fix missing signature when sending email from user card
2017-06-17 10:17:36 +02:00
BENKE Charlene
5320ebc051
getTotalWeightVolume : add conversion Lb & oz to KG
...
New conversion value : Oz once
Little az a wizzard...
2017-06-17 10:16:52 +02:00
Laurent Destailleur
26e80045a6
Merge pull request #7001 from atm-alexis/NEW_blocklog_develop_refactor
...
NEW log download or preview event on a validate bill
2017-06-16 11:06:27 +02:00
Laurent Destailleur
343e8d8498
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-16 00:49:52 +02:00
Laurent Destailleur
ac708a8ee9
Debug accounting module with new structure v6
...
Make accounting module compatible with the new vat code to identify 2
vat code with same rate.
2017-06-15 23:58:56 +02:00
Laurent Destailleur
f39fb5187a
Fix component to select journal
2017-06-15 20:27:40 +02:00
Regis Houssin
cd095e99c9
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-14 12:16:10 +02:00
Laurent Destailleur
1b56e4a01c
Fix look and feel v6
2017-06-14 11:28:42 +02:00
alexis Algoud
ef0907d89e
NEW log download or preview event on a validate bill
2017-06-13 15:55:22 +02:00
Regis Houssin
773abff80e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
2017-06-12 21:24:10 +02:00
Laurent Destailleur
ba3a74576c
Merge 5.0
2017-06-12 18:22:51 +02:00
Laurent Destailleur
5d9a84dedb
Fix sql syntax error
2017-06-12 15:35:50 +02:00
Laurent Destailleur
bf41056c68
Fix test on permission for widgets
2017-06-12 14:21:04 +02:00
Regis Houssin
3445c9d329
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_dict
Conflicts:
htdocs/core/lib/functions.lib.php
2017-06-11 06:27:49 +02:00
Laurent Destailleur
4683ef41be
Fix hide search label on computed field into lists
2017-06-10 22:49:16 +02:00
Laurent Destailleur
6ab47a845e
Fix look and feel v6
2017-06-10 13:54:43 +02:00
Laurent Destailleur
a8e16910c0
Fix look and feel v6
2017-06-10 13:44:20 +02:00
Laurent Destailleur
884c6c674d
Fix css
2017-06-09 20:08:23 +02:00
Regis Houssin
0e8f36dc92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict
2017-06-09 14:00:48 +02:00
Laurent Destailleur
1af74b4c42
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/admin/perms.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/files.lib.php
htdocs/product/class/product.class.php
htdocs/product/class/service.class.php
htdocs/product/index.php
htdocs/product/list.php
htdocs/public/members/new.php
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
Laurent Destailleur
62933e9a26
Fix sql syntax error in some cases
2017-06-09 11:22:42 +02:00
Laurent Destailleur
929946ad47
Fix several problem with hook printFieldListWhere
2017-06-09 10:12:01 +02:00
Regis Houssin
fa58f0f3e8
Fix: add entity filter
2017-06-09 09:25:15 +02:00
Regis Houssin
4c70908ea2
Fix: entity field in combobox
2017-06-08 18:52:01 +02:00
phf
d6d451b54a
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact
2017-06-08 12:03:59 +02:00
phf
711f9696aa
New multi contacts on actioncomm
2017-06-08 12:02:39 +02:00
Laurent Destailleur
3e51d2f537
Fix backto link after creating a third party
2017-06-08 11:51:31 +02:00
Laurent Destailleur
a1144e1f66
Fix missing init of hookmanager
2017-06-08 11:18:41 +02:00
Laurent Destailleur
9c4a2594b1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-06-08 11:07:25 +02:00
Laurent Destailleur
832e288814
FIX #6955
2017-06-08 10:47:22 +02:00
Laurent Destailleur
7587a3d592
Merge branch 'develop' into develop_transverse
2017-06-08 10:25:04 +02:00
Regis Houssin
b183c6e7ac
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_transverse
2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175
Maxi debug of v6
2017-06-07 19:28:31 +02:00
Laurent Destailleur
a0295821ba
Fix errors in extra computed field
2017-06-07 11:38:42 +02:00
Regis Houssin
bfd6116e5b
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
2017-06-06 15:03:36 +02:00
Regis Houssin
7ed0643b52
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 10:54:16 +02:00
Laurent Destailleur
2f59525967
Merge pull request #6942 from hregis/develop_bug
...
Fix: avoid warning "Undefined property: stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
2017-06-06 10:47:20 +02:00
Regis Houssin
79a0b959d1
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse
2017-06-06 10:36:37 +02:00
Laurent Destailleur
2510ec7015
Fix php error
2017-06-06 10:29:34 +02:00
Regis Houssin
b66da3d148
New: big refactorization of multicompany transverse mode
2017-06-06 10:23:33 +02:00
Laurent Destailleur
22efbabfa6
NEW Add hook doUpgrade2
2017-06-06 01:34:25 +02:00
Regis Houssin
74710827b2
Fix: avoid warning "Undefined property:
...
stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
2017-06-03 14:15:34 +02:00
Regis Houssin
a25facef7c
Fix: use 0 instead false
2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_mc
2017-06-03 11:45:15 +02:00
Laurent Destailleur
832e9ed15a
Merge pull request #6932 from atm-ph/fix_develop_get_extra_chkbxlst
...
Fix get extrafields value from getOptionalsFromPost give an error wit…
2017-06-03 01:04:18 +02:00
Laurent Destailleur
e1b19b831a
NEW An external module can hook and add mass actions
2017-06-02 23:57:37 +02:00
Laurent Destailleur
66420d0e80
Restore lost file and better generation of modules
2017-06-02 23:02:48 +02:00
Laurent Destailleur
9e629bdb02
Work on modulebuilder
2017-06-02 20:01:25 +02:00
Laurent Destailleur
c59d216cf5
NEW Can read time spent of others (hierarchy only or all if granted)
2017-06-02 13:24:45 +02:00
phf
64cd1e0923
Fix get extrafields value from getOptionalsFromPost give an error with chkbxlst type on propaldet for exemple
2017-06-02 12:31:03 +02:00
Laurent Destailleur
c70beaa56b
Complete work for mutualizing generic substitution system.
2017-06-01 01:57:22 +02:00
Laurent Destailleur
10ac53077e
Code comment
2017-05-31 11:51:38 +02:00
Laurent Destailleur
292571688b
Fix error message not reported
2017-05-31 10:49:06 +02:00
Regis Houssin
aa780ea33b
Fix: missing dot
2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae
New: getEntity function use true $shared value by default
2017-05-30 18:50:54 +02:00
Laurent Destailleur
df729d8889
Fix travis
2017-05-29 19:28:43 +02:00
Laurent Destailleur
d56cd44ebc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-29 19:11:41 +02:00
Laurent Destailleur
ab5545d02d
Merge pull request #6898 from defrance/patch-12
...
$resaction need in 5.0.x too
2017-05-29 11:41:22 +02:00
BENKE Charlie
18799c3a7f
Changes Done
...
question
need to change $actionclassinstance->results in $actionclassinstance->resactionss ???
2017-05-29 11:00:08 +02:00
Laurent Destailleur
452579150d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2017-05-29 10:43:26 +02:00
Laurent Destailleur
e667d72547
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/build_class_from_table.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
2017-05-29 10:41:51 +02:00
Laurent Destailleur
16456cf19f
Merge pull request #6891 from hregis/develop_api
...
NEW add REST api "memberstypes"
2017-05-29 10:29:04 +02:00
Laurent Destailleur
d03d179fa3
FIX Fullname when member is a moral entity with no name.
2017-05-28 23:43:24 +02:00
Laurent Destailleur
c4f09b8894
Work on modulebuilder
2017-05-28 14:43:17 +02:00
BENKE Charlie
e4f7f2a0b2
$resaction need in 5.0.x too
2017-05-26 12:39:49 +02:00
Regis Houssin
18886849eb
New: add REST api "memberstypes"
2017-05-25 08:54:30 +02:00
Alexandre SPANGARO
e4f5d45c45
Remove old code (selectjournal_accountancy_bookkepping)
2017-05-25 07:10:09 +02:00
Alexandre SPANGARO
1f079fac9d
Move html.formventilation.class.php to html.formaccounting.class.php
2017-05-25 06:57:28 +02:00
Laurent Destailleur
e5fe629a0e
NEW Extrafields support formulas to be computed using PHP expressions
2017-05-24 22:48:44 +02:00
Laurent Destailleur
aef9ef2d75
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-24 13:46:03 +02:00
Laurent Destailleur
6eeb82ec70
FIX dialog window with md theme must not be hidden by left menu part.
2017-05-24 13:45:26 +02:00
Laurent Destailleur
80ce8da7a3
Fix migration errors and responsive design
2017-05-23 15:13:52 +02:00
Laurent Destailleur
1a8884bbbe
NEW Can filter on year and product tags on the product statistic page
2017-05-22 15:20:52 +02:00
Laurent Destailleur
52b5a8ece7
More powerfull dol_move function.
2017-05-21 14:06:43 +02:00
Laurent Destailleur
2dd2ab1003
Look and feel v6
2017-05-20 20:59:54 +02:00
Laurent Destailleur
80cbc28385
NEW Add REST API to push a file.
2017-05-20 15:52:36 +02:00
Laurent Destailleur
807c77f754
Fix inconsistent options
2017-05-19 18:03:49 +02:00
Laurent Destailleur
aec4cef5de
Clean some code for type of event deprecated since 3.3
2017-05-19 12:58:38 +02:00
Laurent Destailleur
7dbe3b1da9
Merge pull request #6843 from aspangaro/6.0-multijournal
...
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-18 17:45:21 +02:00
florian HENRY
82cac745e3
FIX 6863
2017-05-18 14:18:59 +02:00
Laurent Destailleur
0b52c43e05
Fix bad selection of progress when not known
2017-05-18 11:35:12 +02:00
Laurent Destailleur
1a1b27d68c
Fix input of duration
2017-05-18 11:13:18 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
Laurent Destailleur
b29d0385e6
NEW Can send an email to a user from its card.
2017-05-15 00:15:56 +02:00
Alexandre SPANGARO
143c019905
Fix : Sql error on salaries index for accountancy multijournal + debug
2017-05-14 08:07:34 +02:00
Laurent Destailleur
e0abba5cf2
Merge pull request #6831 from Gecka-Apps/5.0-fixes
...
Fix: when sending a mail the default template used should be the first positioned template
2017-05-13 19:35:58 +02:00
Laurent Destailleur
fa290c34fa
Fix against SQL injection. Add phpunit to detect missing escapement.
2017-05-12 16:55:11 +02:00
Laurent Dinclaux
8ae05a9651
Fix: when sending a mail the default template used should be the first positionned template
2017-05-11 13:38:17 +11:00
Laurent Destailleur
cd72c50356
Merge pull request #6799 from Dolibarr/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2017-05-11 00:04:12 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
922fa088b4
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/boxes/box_services_expired.php
2017-05-10 23:47:33 +02:00
Laurent Destailleur
b2e9d4cc21
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-10 23:42:49 +02:00
Laurent Destailleur
2da0a129d1
Multiple file upload on by default on desktop.
2017-05-10 23:41:43 +02:00
Laurent Destailleur
164f3954ee
Merge pull request #6824 from ATM-Marc/NEW_multiple_fileupload
...
NEW permit multiple file upload in linked documents tab
2017-05-10 23:24:41 +02:00
Laurent Destailleur
2b64cf0ebe
Update html.formfile.class.php
2017-05-10 23:24:33 +02:00
Laurent Destailleur
1c7d9b9d9a
Merge pull request #6804 from aspangaro/6.0-multijournal
...
New : Accountancy - Add a list to select the bank journal in bank card
2017-05-10 22:46:30 +02:00
jfefe
d410a320d7
WIP #6504 : CVE-2017-7886
...
'defaultlang' attribute was not filtered before database request which cause an SQL injection.
2017-05-10 20:32:54 +02:00
Laurent Destailleur
5a96ae54b9
FIX Link to files on bank account tab broken with multicompany
...
FIX Link to preview on thirdparty broken with multicompany
2017-05-10 19:08:07 +02:00
Marc de Lima Lucio
984531411d
NEW: permit multiple file upload in linked documents
2017-05-10 15:01:27 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
9fe28c9b2c
NEW Can disable all overwrote translations in one click.
2017-05-09 10:08:04 +02:00
Laurent Destailleur
05d6c2cd75
Fix no more use of constant
2017-05-09 01:36:20 +02:00
Alexandre SPANGARO
a3602ff6b4
Add journal list in new movement card
2017-05-08 06:20:17 +02:00
Alexandre SPANGARO
dd97bbdc82
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-07 15:10:30 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Alexandre SPANGARO
68aaef2f66
Add list to select journal in bank
2017-05-06 08:06:01 +02:00
Alexandre SPANGARO
a4defb8102
Add html form for accountancy journals list
2017-05-06 07:02:34 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Scrutinizer Auto-Fixer
d93552c8c5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-05-05 17:13:29 +00:00
Laurent Destailleur
2e5c32eb62
Merge pull request #6748 from atm-florian/5.0
...
FIX : #6747
2017-05-05 19:06:14 +02:00
Laurent Destailleur
806157ae40
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 17:52:22 +02:00
Laurent Destailleur
15d20497c8
FIX #6795 #6796
2017-05-05 17:46:22 +02:00
Laurent Destailleur
a8292ce990
Code comment
2017-05-05 17:27:16 +02:00
Laurent Destailleur
885a636351
Debug new journal list page
2017-05-05 16:35:05 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
eb2124bfc8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-05 14:14:53 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
a1ac3b470b
Change menu for setup of predefined emails
2017-05-05 14:01:20 +02:00
Laurent Destailleur
90542d119a
FIX trigger name and status set of setStatus for commercial proposal
2017-05-05 13:25:30 +02:00
Laurent Destailleur
9785e9b298
Update commonobject.class.php
2017-05-05 09:57:51 +02:00
Laurent Dinclaux
24a2fb57ea
Resolved merge conflict
2017-05-05 10:22:46 +11:00
Laurent Destailleur
089b882033
Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone
...
FIX ajax autocomplete on clone
2017-05-04 21:05:40 +02:00
Laurent Destailleur
bf616cbe05
Fix bad var
2017-05-04 19:05:02 +02:00
florian HENRY
b8d63ae6c0
Better fix
2017-05-04 14:04:30 +02:00
florian HENRY
9958fcaa6f
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0
2017-05-04 14:02:28 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +02:00
Laurent Destailleur
0c76db7973
FIX #6698 #6742
2017-05-04 13:41:37 +02:00
Laurent Destailleur
7d5b5cf86a
Better behavior for tooltip on click
2017-05-04 13:09:42 +02:00
Laurent Destailleur
c7d736376f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-04 12:41:49 +02:00
Laurent Destailleur
7ec46b3bd6
Finished work to have substitution keys code mutualized.
2017-05-04 12:35:45 +02:00
Laurent Destailleur
f543461e9b
Complete the substitution array with substitution array with all
...
possible keys
2017-05-04 11:21:28 +02:00
Laurent Destailleur
3871da0324
Merge pull request #6729 from atm-florian/dev_importexport_ressources
...
NEW : Add module resources import/export
2017-05-04 09:43:00 +02:00
Laurent Dinclaux
f63f28c7fe
Fix vat_src_code propagation between post types
2017-05-03 21:37:30 +11:00
alexis portable
da4d179d36
fix travis
2017-05-02 23:20:23 +02:00
alexis portable
d1a443f0f0
fix camelcase for travis
2017-05-02 23:11:05 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Marcos García de La Fuente
166f2d262d
Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume
2017-05-02 14:00:27 +02:00
Laurent Destailleur
1e3384a842
Fix travis
2017-04-30 14:16:58 +02:00
Laurent Destailleur
58e2b49b1c
Clean code
2017-04-30 13:49:06 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
4993a43025
Move new feature inventory into module stock.
2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f
Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview
...
New inventory coreobject listview
2017-04-29 21:31:46 +02:00
Laurent Destailleur
a8c775dcbd
Fix compatibility with the removal of "constant".
2017-04-29 18:48:30 +02:00
phf
8219ff84c8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-04-28 14:45:04 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Quentin Vial-Gouteyron
4ab5674ffb
FIX ajax autocomplete on clone
2017-04-25 15:10:46 +02:00
florian HENRY
86338d1781
FIX : #6747
2017-04-24 09:03:25 +02:00
Laurent Destailleur
ec59f08e41
FIX extrafield css for boolean type
2017-04-24 00:46:27 +02:00
florian HENRY
213e0d2870
fix travis
2017-04-19 14:49:12 +02:00
florian HENRY
4efb1ba23a
update credentials
2017-04-18 15:27:18 +02:00
florian HENRY
a52db08cd6
NEW : Add module resources import/export
2017-04-18 15:25:04 +02:00
Laurent Destailleur
3da0aea168
Prepare code to use different SMTP servers.
2017-04-18 01:39:06 +02:00
Laurent Destailleur
4c056d68d8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/commande/list.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/bills.lang
htdocs/societe/list.php
2017-04-15 17:02:05 +02:00
Laurent Destailleur
436f60a784
FIX Cache to load currencies was not working when loading all currencies
2017-04-14 18:08:02 +02:00
Laurent Destailleur
5931bc4068
NEW Feature to crop/resize images available on user and expense reports
2017-04-14 13:53:39 +02:00
Laurent Destailleur
e6e9b65594
NEW Reduce memory usage by removing deprecated constant loading.
2017-04-14 12:38:52 +02:00
Laurent Destailleur
4e021c123b
Fix travis error
2017-04-14 11:28:19 +02:00
Laurent Destailleur
39ebaec064
Replace usage of $bc[$var] with class="oddeven"
2017-04-14 11:22:48 +02:00
Laurent Destailleur
6c069e9a1a
Fix label of long status
2017-04-13 15:15:44 +02:00
Laurent Destailleur
3e9ccc186a
NEW Small PDF template for products
2017-04-13 10:26:12 +02:00
Laurent Destailleur
a6b05bb4da
Merge branch '5.0' of github.com:Dolibarr/dolibarr into 5.0
2017-04-12 14:08:58 +02:00
Laurent Destailleur
26a9999fbf
Support of preview for pdf with several pages
2017-04-12 11:38:55 +02:00
Laurent Destailleur
4eaa1d4f46
Add nb of generation into list of template invoices
2017-04-11 20:07:35 +02:00
Laurent Destailleur
8e33c8090d
FIX No filter on company when showing the link to elements.
2017-04-11 19:07:03 +02:00
Laurent Destailleur
423ffefbf3
NEW Add hidden option THIRDPARTY_INCLUDE_PARENT_IN_LINKTO
2017-04-11 18:18:36 +02:00
Laurent Destailleur
2446cb5431
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture.php
htdocs/compta/facture/fiche-rec.php
htdocs/contact/list.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/facture/card.php
htdocs/societe/list.php
htdocs/user/document.php
2017-04-11 11:43:54 +02:00
Laurent Destailleur
81020cea77
Merge pull request #6660 from atm-florian/dev_contractselect
...
NEW select2 for contract selector
2017-04-11 11:08:59 +02:00
Laurent Destailleur
d4de81ed6d
Merge pull request #6659 from altatof/fix_incoterm
...
FIX: dont get empty "Incoterms : - " string if no incoterm
2017-04-11 11:08:17 +02:00
Laurent Destailleur
6aa56ce0fa
NEW Add a tracking id into mass emailing
...
Prepare code to use a dedicated SMTP server according to context.
2017-04-11 10:57:17 +02:00
Marcos García de La Fuente
996b5e9f87
Corrected translation errors and little bug showing a non-available button to a restricted user
2017-04-09 18:17:46 +02:00
Laurent Destailleur
52c86cb3f5
NEW Bulk actions available on supplier orders
2017-04-09 13:12:25 +02:00
Laurent Destailleur
a0e75d0af0
Work on look and feel v6
2017-04-07 18:38:55 +02:00
Laurent Destailleur
be439f6252
Work on look and feel v6
2017-04-07 16:16:44 +02:00
florian HENRY
e76a00845d
better test
2017-04-07 14:55:59 +02:00
florian HENRY
a1c1aa054f
new : select2 for contract selector
2017-04-07 14:55:14 +02:00
altatof
d892a89f45
FIX: dont get empty "Incoterms : - " string if no incoterm
2017-04-07 14:15:51 +02:00
Laurent Destailleur
60a54041c2
NEW Enable bulk actions delete on supplier invoices
2017-04-07 14:09:19 +02:00
Laurent Destailleur
ea44e14b60
Start debug the variant module
2017-04-07 11:01:12 +02:00
Laurent Destailleur
f598bf8bef
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:59:11 +02:00
Laurent Destailleur
8363bee234
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/filefunc.inc.php
2017-04-06 21:56:48 +02:00
Laurent Destailleur
e2ea5945dd
Work on look and feel v6
2017-04-06 21:48:28 +02:00
Alexis ALGOUD
736800dd66
little fix
...
for param into list pagination
2017-04-05 12:16:10 +02:00
Laurent Destailleur
1dc2cae3a5
NEW Show company into combo list of projects
2017-04-05 11:51:55 +02:00
Laurent Destailleur
7c868888a5
FIX Add option MAIN_MAIL_USE_MULTI_PART to include text content into
...
HTML email and add option MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS to
restore the inline images feature.
2017-04-05 01:02:03 +02:00
Laurent Destailleur
13333ffd73
Add multipart text version into html emails.
2017-04-05 00:39:32 +02:00
Laurent Destailleur
c4d4856997
FIX sql errors on user card
2017-04-04 12:23:44 +02:00
Laurent Destailleur
9df4bac202
NEW Bookmarks are into a combo list.
2017-04-04 11:56:19 +02:00
Laurent Destailleur
761ece3125
Remove $maxfilenamelength replace with auto overflow.
2017-04-03 16:59:22 +02:00
Laurent Destailleur
e8767122b0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/societe/list.php
2017-04-03 11:05:19 +02:00
Laurent Destailleur
13587fa13e
Fix key were not translated
2017-04-03 10:51:35 +02:00
Laurent Destailleur
6a69f9349b
Fix too much logs in list
2017-04-03 10:43:04 +02:00
Laurent Destailleur
a5a0995313
More comments
2017-04-03 10:11:29 +02:00
Laurent Destailleur
17a1874e36
FIX Counter of notification of a thirdparty
2017-04-01 13:43:05 +02:00
Laurent Destailleur
d975e7f442
Work on 6.0 look and feel
2017-04-01 12:46:47 +02:00
Laurent Destailleur
88017f5707
Merge pull request #6369 from atm-florian/dev_replace_extrefield_checkboxByMultiSelect
...
NEW : change render extrafields checkbox list for multiselectarray
2017-03-31 18:12:58 +02:00
Laurent Destailleur
7bcd4d74ef
Merge pull request #6617 from dolibarr95/patch-9
...
Display mobile icon
2017-03-31 17:43:01 +02:00
Laurent Destailleur
01a74a8d23
Work on 6.0 look and feel
2017-03-31 17:41:20 +02:00
Laurent Destailleur
8e70c4a0b7
Work on 6.0 new look and feel
2017-03-30 15:39:50 +02:00
Marcos García de La Fuente
cd5b074a48
FIX #6621 Documents tab shows greyed out upload form even if the option to show actions not available is disabled
2017-03-30 15:21:20 +02:00
dolibarr95
1489847a74
Display mobile icon
...
Display a specific icon when mobile
2017-03-30 09:49:34 +02:00
Laurent Destailleur
fbca800246
FIX Detection of color brightness
2017-03-29 11:46:13 +02:00
Laurent Destailleur
4fa5448aab
FIX Detection of color brightness
2017-03-29 10:34:33 +02:00
Laurent Destailleur
e416ea275e
Work on 6.0 look and feel
2017-03-28 21:04:38 +02:00
phf
fe1b1ede0f
Fix remove filter on date
2017-03-28 17:35:51 +02:00
phf
c3e8a5be62
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-28 17:20:50 +02:00
Laurent Destailleur
31bde1ae74
Code for 6.0 new look and feel
2017-03-28 17:12:15 +02:00
phf
5decbde79b
Fix search by date does not work
2017-03-28 17:06:22 +02:00
phf
df170769c9
Update function module inventory
2017-03-28 16:05:18 +02:00
phf
70743e1f68
Update list header to be print with Dolibarr functions
2017-03-28 13:48:33 +02:00
Laurent Destailleur
f843f8a93d
Start to move search bar before table titles
2017-03-27 00:48:50 +02:00
atm-ph
ed27b44f62
Add TODO to print header table as Dolibarr
2017-03-26 14:58:59 +02:00
atm-ph
ae2ab3276d
Refactoring and class/method documentation
2017-03-26 14:37:25 +02:00
Laurent Destailleur
e38ad37ce3
FIX #6517 #6525 Autocompletion of thirdparty after n chars not
...
implemented
2017-03-26 05:02:06 +02:00
atm-ph
09f645fc9f
Fix travis
2017-03-25 23:21:49 +01:00
atm-ph
76b95aeec0
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-25 19:15:25 +01:00
atm-ph
2fc74b4962
Refactoring class
2017-03-25 18:53:14 +01:00
atm-ph
cb576e6c99
Refactoring class
2017-03-25 18:26:10 +01:00
atm-ph
fce8e08b51
Refactoring and fix
2017-03-25 18:13:39 +01:00
atm-ph
ae33e40dc8
Refactoring and add method comments
2017-03-25 17:32:42 +01:00
atm-ph
269645dfc7
Add method documentations
2017-03-25 10:48:06 +01:00
atm-ph
de832d90a9
Refactoring
2017-03-25 00:50:53 +01:00
Laurent Destailleur
292bcae592
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-25 00:05:04 +01:00
Laurent Destailleur
d1a988a0be
Fix document_preview is possible on files with + chars inside.
2017-03-24 17:32:38 +01:00
atm-ph
edc2d39702
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-03-24 17:06:40 +01:00
Laurent Destailleur
38660418b4
Include preview of pdf into dol_banner
2017-03-23 22:27:44 +01:00
Laurent Destailleur
664380d304
Css enhancement
2017-03-23 21:24:57 +01:00
Laurent Destailleur
eb145faffd
Replace parameter mixte with textselect
2017-03-23 19:57:45 +01:00
Laurent Destailleur
d1c29bf698
Merge pull request #6552 from defrance/patch-91
...
NEW : introducing "mixte" mode for select_duration
2017-03-23 19:54:33 +01:00
Laurent Destailleur
fec3a89aa5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-23 11:38:46 +01:00
Laurent Destailleur
0a35d17207
CSS enhancement
2017-03-23 10:59:13 +01:00
BENKE Charlie
7999cb9a46
introducing "mixte" mode for select_duration
...
If 'select' then input hour and input min is a combo,
if 'text' input hour is in text and input min is a text,
if 'mixte' input hour is in text and input min is a combo
2017-03-21 23:48:06 +01:00
Laurent Destailleur
acdfd6ab9e
css enhancement
2017-03-21 18:23:58 +01:00
Laurent Destailleur
e7a45a7f6a
NEW Use html5 type "number" on select field for year and duration.
2017-03-21 17:50:43 +01:00
Laurent Destailleur
68257283e4
Enhance select list
2017-03-21 13:39:42 +01:00
Laurent Destailleur
1b0b4c9609
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688
Page societe/soc.php and compta/facture.php was renamed into card.php
...
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
b169f93abc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-19 14:27:12 +01:00
Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
b9d6122c53
Add comments
2017-03-18 19:56:53 +01:00
Laurent Destailleur
f7e71d1de2
FIX LOG_ERROR does not exists. Use LOG_ERR.
2017-03-18 11:48:02 +01:00
Laurent Destailleur
597fb11d08
Fix error management in duplicate trigger
2017-03-18 11:36:48 +01:00
Laurent Destailleur
35b79818b7
Uniformize css rules
2017-03-16 20:33:51 +01:00
Laurent Destailleur
dba6d99686
Minor look enhancement
2017-03-16 17:02:30 +01:00
Laurent Destailleur
6f25d6de24
Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
2017-03-15 12:33:06 +01:00
Laurent Destailleur
4c0ff38020
Fix closing boxes
2017-03-15 11:58:13 +01:00
Laurent Destailleur
d951114c18
Merge branch 'develop' into NEW_odt_others_objects
2017-03-14 10:44:05 +01:00
arnaud
192a825de8
NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class
2017-03-14 09:25:29 +01:00
Alexandre SPANGARO
c6c07bf9f4
New : Add project to social contributions
2017-03-12 14:32:49 +01:00
Laurent Destailleur
4bf0e31299
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/loan.lang
htdocs/theme/eldy/style.css.php
htdocs/theme/md/style.css.php
2017-03-11 02:40:42 +01:00
Laurent Destailleur
47dd53abbe
NEW The substitution keys available for emailing edition is now into a
...
popup
2017-03-11 02:36:22 +01:00
Laurent Destailleur
4737c62394
FIX Avoid flash on screen
2017-03-11 00:52:35 +01:00
Laurent Destailleur
2054ce0aab
FIX Avoid flash on screen
2017-03-11 00:50:55 +01:00
Laurent Destailleur
209bd0b3e4
2nd try to fix better compatibility
2017-03-10 16:53:26 +01:00
Laurent Destailleur
2a3d3b4b50
Fix dol_banner for agenda
2017-03-10 16:40:38 +01:00
Laurent Destailleur
a9b39f3028
Fix dol_banner for agenda
2017-03-10 16:27:28 +01:00
Laurent Destailleur
57c2971175
Fix dol_banner for agenda
2017-03-10 16:19:18 +01:00
Laurent Destailleur
c72e7c1057
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2017-03-10 14:54:35 +01:00
Laurent Destailleur
de2558c907
Fix useless lines
2017-03-10 12:47:51 +01:00
Laurent Destailleur
50044ed21e
FIX #6499
2017-03-10 12:45:56 +01:00
arnaud
a796a321cc
Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects
...
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/product/admin/product.php
htdocs/product/card.php
2017-03-10 12:16:55 +01:00
arnaud
1d31603ad2
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9_dalibo
2017-03-10 11:46:59 +01:00
Laurent Destailleur
46eedeafe8
Fix message shown to many times
2017-03-10 11:30:46 +01:00
Laurent Destailleur
8389db18bf
Fix solution for comaptibility
2017-03-10 10:07:09 +01:00
Laurent Destailleur
d241adc201
NEW Use autocompletion on the "Add widget list".
2017-03-09 13:22:43 +01:00
arnaud
4a7e3fb387
NEW odt usergroup
2017-03-08 11:34:21 +01:00
Laurent Destailleur
8ac1aab45a
Uniformize look and feels
2017-03-07 18:34:57 +01:00
florian HENRY
fc63008485
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect
2017-03-06 15:35:29 +01:00
Laurent Destailleur
4e4045d18a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-03-05 22:12:08 +01:00
Laurent Destailleur
5f79b2d0c6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/accountancy/admin/categories.php
htdocs/expensereport/class/expensereport.class.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2017-03-05 22:11:35 +01:00
Laurent Destailleur
52a4863ed8
Merge pull request #6480 from dolibarr95/patch-2
...
Add label tag
2017-03-05 21:40:31 +01:00
Laurent Destailleur
5fa6592d6e
Fix bad conf used
2017-03-04 20:10:50 +01:00
Laurent Destailleur
379e0083ab
Fix bad help
2017-03-03 18:00:53 +01:00
Laurent Destailleur
6c91cb4f90
Fix it was not possible to create/edit a new chart of account
2017-03-03 17:59:49 +01:00
Laurent Destailleur
28ad50e059
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/suppliers.lang
2017-03-03 14:31:35 +01:00
Laurent Destailleur
85518c6a54
FIX #6479
2017-03-03 14:04:40 +01:00
Laurent Destailleur
07c828d38f
Introduce method loadLangs to save code lines
2017-03-03 13:27:51 +01:00
arnaud
cff9fa0e6b
FIX user odt
2017-03-03 12:01:58 +01:00
arnaud
abeba95de9
New USER odt
2017-03-02 15:13:42 +01:00
dolibarr95
d3a80795ce
Add label tag
...
Add a label html tag for the input radio extrafield tag.
2017-03-02 11:40:43 +01:00
Laurent Destailleur
d202003e29
Fix translation
2017-03-01 18:12:06 +01:00
Laurent Destailleur
8487f0fc96
Fix missing setup of new option
2017-03-01 11:18:11 +01:00
Laurent Destailleur
3c54cb5ba9
Fix avoid trigger during migration
2017-02-28 20:55:14 +01:00
Laurent Destailleur
9648f20a2e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-28 12:08:41 +01:00
Laurent Destailleur
59d2943d8d
Fix context must be provided to triggers using ->context no a dedicated
...
property.
2017-02-28 12:07:05 +01:00
Laurent Destailleur
0f22beb774
Upgrade to ckeditor 4.6.2.
2017-02-28 10:49:58 +01:00
Laurent Destailleur
74e8fb9c19
NEW Can set number of dump to keep with job "local database backup"
2017-02-27 02:04:25 +01:00
Laurent Destailleur
43f3e46aac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-27 01:23:48 +01:00
Laurent Destailleur
4f24613de0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/class/expensereport.class.php
2017-02-27 01:19:03 +01:00
Laurent Destailleur
92acbbd8a8
Fix parameters
2017-02-27 00:22:11 +01:00
Ion
320da17c78
Add object extrafields to mail form
2017-02-26 03:42:42 +01:00
Laurent Destailleur
1ef899dacc
Prepare database to follow supplier discounts
2017-02-24 15:22:32 +01:00
Laurent Destailleur
baa1f3ed2b
Clean doc about changes in external libraries
2017-02-24 14:35:20 +01:00
Laurent Destailleur
fb88eaf2a4
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-02-23 02:55:50 +01:00
Laurent Destailleur
92d9eb3c5d
Several fix for a better management of #6424
2017-02-22 17:46:54 +01:00
Laurent Destailleur
24c2675705
Merge pull request #6424 from atm-florian/dev_can_send_to_multiple_email
...
NEW : Can send email to multiple destinaries from mail form
2017-02-22 14:39:35 +01:00
Laurent Destailleur
ba03b17354
Fix css
2017-02-22 14:30:39 +01:00
Laurent Destailleur
a0fb53d5b1
Merge branch 'develop' into NEW_pdf_supplier_payment
2017-02-22 14:20:47 +01:00
Laurent Destailleur
cbe855370b
Merge pull request #6451 from laudeco/feature/list_user_by_firstname
...
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
2017-02-22 14:17:00 +01:00
Laurent Destailleur
3f3b82ed64
Merge pull request #6454 from atm-florian/dev_fix_unittrad
...
fix unit trad
2017-02-22 14:16:28 +01:00
Laurent Destailleur
1681445427
Remove useless line
2017-02-22 00:08:25 +01:00
florian HENRY
c8de648924
fix unit trad
2017-02-21 19:07:57 +01:00
Laurent Destailleur
eef3824f8c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/categories.php
htdocs/admin/dict.php
htdocs/langs/de_DE/bills.lang
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/bills.lang
2017-02-21 10:34:52 +01:00
De Coninck Laurent
33d1d78329
FIX - use MAIN_FIRSTNAME_NAME_POSITION for select users
2017-02-21 09:22:50 +01:00
Alexis ALGOUD
4a97864d23
change for tms
2017-02-20 15:54:02 +01:00
Alexis ALGOUD
07d6bbf835
change for tms
2017-02-20 15:53:43 +01:00
Laurent Destailleur
a8129ce46e
Fix transaction/sql error
2017-02-20 11:49:27 +01:00
Laurent Destailleur
89d10ae5aa
Fix the accounting account groups must be editable by book keeper, not
...
admin user.
2017-02-20 11:21:38 +01:00
Laurent Destailleur
2dbae7b808
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 17:14:00 +01:00
Laurent Destailleur
fd111cb1c6
NEW tooltip can be on hover or on click with textwithpicto function.
2017-02-17 17:11:14 +01:00
arnaud
4ec664029d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_pdf_supplier_payment
2017-02-17 16:40:14 +01:00
Laurent Destailleur
1f156c1716
Merge pull request #6436 from defrance/patch-79
...
on list, preview tooltip is not displayed correctly
2017-02-17 13:27:31 +01:00
florian HENRY
f7e1927b43
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_replace_extrefield_checkboxByMultiSelect
2017-02-17 13:25:19 +01:00
florian HENRY
4836fa8f76
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_can_send_to_multiple_email
2017-02-17 13:24:06 +01:00
Laurent Destailleur
8d03f86f45
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-02-17 13:10:46 +01:00
Laurent Destailleur
a91d57037e
FIX #6433
2017-02-17 13:09:28 +01:00
BENKE Charlie
b94312162e
on list, preview tooltip is not displayed correctly
...
it's a problem of alignment, the tooltip is cut by the left part on list (ex : comm/propal/list.php)
think we can do better
2017-02-17 12:05:24 +01:00
Laurent Destailleur
afa5ef2913
NEW Introduce fields that can be computed during export in export
...
profiles.
2017-02-17 00:19:28 +01:00
florian HENRY
a98e5b7290
fix syntax
2017-02-15 11:46:36 +01:00
florian HENRY
5ec01b3175
NEW : Can send email to multiple destinaries from mailform
2017-02-15 11:41:09 +01:00
florian HENRY
a26081d352
Merge branch 'develop' of local repository into dev_replace_extrefield_checkboxByMultiSelect
2017-02-15 09:10:49 +01:00
Laurent Destailleur
eb70d6eea1
Debug of feature for browser notifications
2017-02-14 18:20:01 +01:00
arnaud
977c18513d
FIX pdf supplier payment work
2017-02-14 12:00:56 +01:00
Laurent Destailleur
05c9f57fd4
Move edition of emails templates out of dictionaries so we would be able
...
to have templates per user (not reserved to admin).
2017-02-12 18:13:49 +01:00
arnaud
4230b075c2
INIT pdf supplier payment
2017-02-10 17:28:00 +01:00
Laurent Destailleur
ad361d6d45
Merge pull request #6394 from aspangaro/6.0-fiscalyear
...
[FP17] Accountancy - Prepare fiscal year
2017-02-08 19:25:02 +01:00
Laurent Destailleur
596c092ec8
Merge pull request #6219 from atm-florian/dev_changelistchild
...
NEW : Allow extrafields list select to be dependands on other standard list and not only other extrafields list
2017-02-08 16:49:18 +01:00
Laurent Destailleur
d5b10a18b7
Debug module variant
2017-02-08 12:52:31 +01:00
Laurent Destailleur
e1a6e6e4ab
Rename "attributes" into "variants" to avoid confusion with extrafields
2017-02-08 12:37:38 +01:00
Laurent Destailleur
b24f244f67
Merge pull request #5533 from marcosgdf/prod-attr
...
Feature Request: NEW Added product attributes feature
2017-02-08 11:20:33 +01:00
Laurent Destailleur
b611c5ca53
Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
...
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
Alexandre SPANGARO
4126dcff03
[FP17] Accountancy - Prepare fiscal year for a better complete accountancy. For the moment, remove function to update status and delete a fiscal year. Need controls and a specific function to block lines in the book keeping if the fiscal year is closed.
2017-02-08 06:51:42 +01:00
Laurent Destailleur
fcbc12ce31
Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project
...
New link movement stock to project
2017-02-06 20:45:04 +01:00
Laurent Destailleur
d230883638
Merge pull request #6367 from gnovaro/patch-2
...
Code style
2017-02-06 20:25:16 +01:00
Laurent Destailleur
a673afe601
NEW Description of feature of a module into a dedicated popup
2017-02-04 14:16:17 +01:00
BENKE Charlie
3f236b1ebf
FIX : $resaction not used in all case
...
Please integrate on next 5.0
2017-02-03 12:14:29 +01:00
Laurent Destailleur
53661e1e4f
Merge pull request #6211 from GPCsolutions/optimizetranslate
...
[Qual] Optimize language file loading
2017-02-03 11:55:29 +01:00
Laurent Destailleur
3dea950c24
Merge pull request #6355 from atm-ph/new_alternate_htmlid_select_project
...
New htmlid can be use instead of htmlname for select projects
2017-02-03 11:44:54 +01:00
florian HENRY
dccddf5c7e
NEW : change render extrafields checkbox list for multiselectarray
2017-02-03 09:25:26 +01:00
Gustavo Novaro
f815d1bed3
Code style
2017-02-02 17:30:06 -03:00
atm-ph
ac20a1a874
Fix remove param htmlid in ajax_combobox
2017-02-02 20:47:45 +01:00
Marcos García de La Fuente
d06fb423c0
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/langs/en_US/products.lang
2017-02-02 20:07:41 +01:00
Laurent Destailleur
c3fb559d3b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modProduct.class.php
2017-02-01 20:58:17 +01:00
Laurent Destailleur
9a9b31c9c0
Fix cancel button + logic to close project when setting opp to WON/LOST.
2017-02-01 13:25:16 +01:00
phf
aea6a8f9ec
Fix (
2017-01-31 14:03:54 +01:00
phf
e73c60b526
New htmlid can be use instead of htmlname for select projects
2017-01-31 12:20:45 +01:00
Laurent Destailleur
756919de2a
Fix deadlock feature: could not solve a situation where an emailing was
...
validated by error.
2017-01-29 16:08:45 +01:00
atm-ph
ccad6d6dde
New show on project "overview" tab the informations about movements stock
2017-01-29 13:36:33 +01:00
Laurent Destailleur
fd90bf466b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/societe/soc.php
2017-01-28 15:12:14 +01:00
Laurent Destailleur
c88e63ecc9
FIX #6259
2017-01-28 15:01:17 +01:00
Laurent Destailleur
bc8ccd8ec5
Fix bad var set
2017-01-28 13:01:10 +01:00
florian HENRY
055a00a338
fix travis
2017-01-27 15:18:12 +01:00
florian HENRY
cb6209de31
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_changelistchild
Conflicts:
htdocs/core/class/commonobject.class.php
2017-01-27 15:16:28 +01:00
Laurent Destailleur
29df2c9115
Merge branch 'develop' into mail-lines
2017-01-27 01:29:58 +01:00
Laurent Destailleur
70091eceed
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2017-01-27 01:26:11 +01:00
Laurent Destailleur
0c14e1d233
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-27 01:24:55 +01:00
Laurent Destailleur
3c86507ce6
FIX #6328
2017-01-27 00:51:22 +01:00
Laurent Destailleur
1239e8600a
Merge pull request #6326 from altatof/fix_entity_thirdpart_files
...
Fix entity thirdparty files links
2017-01-27 00:30:03 +01:00
Laurent Destailleur
053afe21dd
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/user/class/user.class.php
2017-01-26 23:40:16 +01:00
Laurent Destailleur
c1b59b1950
Fix several security bugs on expense report
2017-01-26 18:08:00 +01:00
Laurent Destailleur
c39fcce9f1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-26 10:45:38 +01:00
Laurent Destailleur
9889f0a4a2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/modules/modProjet.class.php
htdocs/filefunc.inc.php
2017-01-26 10:44:50 +01:00
florian HENRY
13917cebdc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_changelistchild
2017-01-25 11:02:23 +01:00
altatof
d65cb29536
FIX: use param for http links
2017-01-25 09:25:06 +01:00
Laurent Destailleur
755d353dfa
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2017-01-24 18:41:29 +01:00
Laurent Destailleur
84fec7c5c7
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2017-01-24 18:40:01 +01:00
Laurent Destailleur
b1e5d8ce98
FIX Combo list of VAT is wrong on POS
2017-01-24 14:33:49 +01:00
Laurent Destailleur
f591e2b1b1
FIX Combo list of VAT is wrong on POS
2017-01-24 14:29:05 +01:00
Laurent Destailleur
1878647d26
NEW Add statistics on supplier tab.
2017-01-23 20:54:52 +01:00
Laurent Destailleur
9a59fbada7
Fix missing info admin picto. Fix colspan.
2017-01-23 17:31:39 +01:00
florian HENRY
d714a52f95
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
dev_changelistchild
Conflicts:
htdocs/core/class/commonobject.class.php
2017-01-23 11:35:11 +01:00
Laurent Destailleur
7622d3b2fb
Fix missing info admin picto. Fix colspan.
2017-01-23 10:23:24 +01:00
Laurent Destailleur
daf40ed573
NEW Direct open of card after a search if on record only found.
2017-01-22 23:35:32 +01:00
Laurent Destailleur
39151d7a74
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-22 12:14:18 +01:00
Laurent Destailleur
65f7de8f64
Fix css and look 5.0
2017-01-22 12:13:32 +01:00
Laurent Destailleur
5362d10c0d
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2017-01-21 21:56:24 +01:00
Laurent Destailleur
6ab9ba3284
Fix management of alternative language for Greek (el_CY)
2017-01-21 21:52:42 +01:00
Laurent Destailleur
b8a80f9311
Fix code comment and missing showLinkToObjectBlock hook declaration as
...
an addreplace hook.
2017-01-21 17:30:35 +01:00
Laurent Destailleur
3a2d9c8610
Fix for rtl languages
2017-01-21 16:12:25 +01:00
Laurent Destailleur
9a5670787f
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-21 12:26:50 +01:00
Laurent Destailleur
fc4aa96cd7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/dispatch.php
2017-01-20 21:02:05 +01:00
Laurent Destailleur
6780b20968
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-20 14:11:55 +01:00
Laurent Destailleur
2f4ff66c43
Minor fixes
2017-01-20 14:10:57 +01:00
Laurent Destailleur
412be59f78
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-20 12:09:39 +01:00
Laurent Destailleur
4047de82bd
Fix navigation on projects
2017-01-20 10:27:37 +01:00
Laurent Destailleur
03c1521cde
Merge pull request #6271 from altatof/fix_extra_input
...
FIX: extrafield input for varchar was not working with special char
2017-01-18 16:53:43 +01:00
Laurent Destailleur
562bdbc9f5
Merge pull request #6291 from gnovaro/patch-1
...
Improve code style
2017-01-18 16:44:56 +01:00
Laurent Destailleur
2566df8252
Merge pull request #6298 from benlo06/fix_shipping_contactid
...
FIX getIdContact for shipping
2017-01-18 15:53:32 +01:00
Benoit
73852beb4e
FIX contactid for shipping pdf
2017-01-17 21:55:21 +01:00
arnaud
39f35bbaab
FIX all dolibarr versions about project list and ajax completion bug
2017-01-17 11:17:40 +01:00
Gustavo Novaro
0f6cb52376
Improve code style
...
Replace var for public and private.
2017-01-16 17:40:13 -03:00
altatof
3dd160c663
use dol_escape_htmltag
2017-01-16 09:17:37 +01:00
Laurent Destailleur
36bd63c1a7
NEW PHP 7.1 compatibility
2017-01-16 09:05:18 +01:00
Laurent Destailleur
6bfd534a36
NEW PHP 7.1 compatibility
2017-01-16 01:21:33 +01:00
Laurent Destailleur
846e827e09
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/admin/modules.php
htdocs/core/class/html.formfile.class.php
htdocs/product/stats/card.php
2017-01-16 00:48:37 +01:00
Laurent Destailleur
4ecd657f34
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-16 00:02:43 +01:00
Laurent Destailleur
0671f75417
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-16 00:01:37 +01:00
Regis Houssin
fd4a19855d
Fix: preview image not show with multicompany product sharing
2017-01-15 12:09:26 +01:00
Marcos García de La Fuente
d09a3628c5
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/compta/facture.php
2017-01-14 23:59:14 +01:00
Laurent Destailleur
1fd9f5e1fb
Fix: host was twice into message id for smtp driver and swiftmailer was
...
not using dol_getprefix() to build host.
2017-01-14 13:27:44 +01:00
altatof
55c0a99bce
fix was not at the right place
2017-01-13 15:42:07 +01:00
altatof
487b5b25db
FIX: extrafield input for varchar was not working with special char
...
within (ie double quotes)
2017-01-13 15:37:33 +01:00
Laurent Destailleur
2c6672d17a
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/login.tpl.php
2017-01-12 11:32:51 +01:00
Laurent Destailleur
c42b48636a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/core/class/CMailFile.class.php
htdocs/societe/class/api_contact.class.php
2017-01-12 11:06:24 +01:00
Laurent Destailleur
5e71ff816f
Increase limit for better backward compatibility without loosing minimum
...
security.
2017-01-12 10:51:31 +01:00
Regis Houssin
5898d27609
Fix: avoid errors if constants values not exists
2017-01-11 16:47:17 +01:00
Laurent Destailleur
5553be4aa9
Fix code comment
2017-01-11 16:08:04 +01:00
Laurent Destailleur
1559c45a61
FIX link for not found photo when using gravatar. Must use external url
2017-01-10 09:24:55 +01:00
Laurent Destailleur
5c233a41b3
NEW Add hook "formatNotificationMessage"
2017-01-09 23:55:53 +01:00
Laurent Destailleur
93ab224614
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-01-09 23:33:36 +01:00
Laurent Destailleur
decbda3e23
Fix inversion application name - company name
2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27
Fix generic text must be set before specific for notification
2017-01-09 21:07:54 +01:00
Alexis Algoud
8b4a43ec77
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-09 10:31:05 +01:00
Laurent Destailleur
51b9802de4
NEW Hook to allow inserting custom product head #6001
2017-01-07 20:42:35 +01:00
Laurent Destailleur
4c4aeba855
Fix project on loans
2017-01-07 17:54:47 +01:00
Laurent Destailleur
e9853f3cd7
Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into
...
Franck-MOREAU-develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
htdocs/loan/card.php
htdocs/loan/class/loan.class.php
htdocs/projet/element.php
2017-01-07 17:45:05 +01:00
arnaud
b813144edb
NEW generation ODT
2017-01-06 16:44:09 +01:00
Laurent Destailleur
e57f834434
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2017-01-04 17:06:02 +01:00
Laurent Destailleur
71e368aa83
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-01-04 17:04:25 +01:00
Laurent Destailleur
2aae4ea6ea
FIX We must not drop column if there is still record on other entities.
2017-01-04 15:05:13 +01:00
Alexis Algoud
370be70e46
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr into NEW_inventory_coreobject_listview
2017-01-03 16:30:50 +01:00
Ion Agorria
522fb4cf7a
Add email template for each line in object
2016-12-31 17:39:01 +01:00
Laurent Destailleur
f46ce68d08
NEW Can sort thumbs visible on product card
2016-12-31 16:16:20 +01:00
Laurent Destailleur
f1961b0207
Work on sorting/indexing upload files
2016-12-31 03:43:22 +01:00
Marcos García de La Fuente
47a444b2ab
Merge branch 'develop' into prod-attr
2016-12-27 15:54:53 +01:00
Laurent Destailleur
b5c815367c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-26 15:44:31 +01:00
Laurent Destailleur
bbd3734a21
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
2016-12-26 12:42:23 +01:00
Laurent Destailleur
e297b64722
Several security fix in using mailings.
2016-12-26 12:35:10 +01:00
Laurent Destailleur
c9c8079c3d
Can add additionnal paramon mail to solve rare sendmail problems
2016-12-26 00:00:28 +01:00
Marcos García de La Fuente
5669f734b8
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/comm/propal/card.php
# htdocs/commande/card.php
# htdocs/compta/facture.php
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/commande/card.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-12-24 21:39:40 +01:00
florian HENRY
337897e0a1
NEW : Allow extrafields list select to be dependands on other standard
...
list and not only other extrafields list
2016-12-23 15:01:49 +01:00
Laurent Destailleur
a2133f391f
Complete work on dol_banner
2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2
Fix css and fix navigation on resource tab.
2016-12-23 13:04:46 +01:00
Raphaël Doursenaud
ac92e23b59
[Qual] Optimize language file loading
...
Using fscanf() and the proper format is about twice as fast as
using fgets() followed by explode() and trim().
This is a small optimization per se but since this code is
called often it yields about 33% rendering time improvement on
the homepage where about 50% of the time is spent on loading the
translation files.
2016-12-23 01:11:50 +01:00
Laurent Destailleur
ba7ca3da6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop6
Conflicts:
htdocs/core/photos_resize.php
htdocs/install/mysql/data/llx_c_action_trigger.sql
2016-12-22 17:57:42 +01:00
Laurent Destailleur
b4ed0a1e12
Fix nb of lat approvals wrong
2016-12-22 17:30:39 +01:00
Laurent Destailleur
081d3f0814
Quick hack by adding hidden constant to solve a locking feature (how to
...
add project if likned to another third on project view)
2016-12-22 16:52:03 +01:00
Laurent Destailleur
d66bc10d05
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84
Fix warning for approval delay.
2016-12-22 15:49:06 +01:00
Laurent Destailleur
77c320a092
Fix warning for expense report late
2016-12-22 15:33:43 +01:00
Laurent Destailleur
26098082d0
NEW Uploaded files are indexed into database
2016-12-20 22:14:27 +01:00
Laurent Destailleur
ed0ffd6f5a
NEW Uploaded files are indexed into database
2016-12-20 19:42:25 +01:00
Laurent Destailleur
0ef963604f
Fix option moreinheader not correctly supported with smtps
2016-12-20 12:38:24 +01:00
Laurent Destailleur
3c79f3acb5
Minor fixes or code comment
2016-12-20 12:06:26 +01:00
Laurent Destailleur
be19a999f5
Fix regression losing warning on not defined emails
2016-12-19 18:11:53 +01:00
Laurent Destailleur
0eded9a8b7
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-19 02:36:10 +01:00
Laurent Destailleur
0d1d68d5d9
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/admin/dict.php
htdocs/product/price.php
2016-12-19 02:34:29 +01:00
Laurent Destailleur
74e00c4d80
More comment and hidden option to solve problems when sending emails.
2016-12-19 01:04:17 +01:00
Laurent Destailleur
dbf96b8f59
Log at wrong place
2016-12-18 23:32:31 +01:00
Laurent Destailleur
54aa8696ad
Fix regression
2016-12-18 13:01:26 +01:00
Laurent Destailleur
9d3bd9d36f
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/errors.lang
2016-12-18 11:57:04 +01:00
Laurent Destailleur
0988a2f173
Merge pull request #6187 from gnovaro/patch-5
...
var to public
2016-12-18 11:30:24 +01:00
Laurent Destailleur
3d57a457eb
Merge pull request #6176 from gnovaro/patch-2
...
Replace attributes var for public
2016-12-18 11:28:04 +01:00
Laurent Destailleur
4ece746437
Merge pull request #6168 from defrance/patch-61
...
FIX navigation field is always ref
2016-12-18 11:02:14 +01:00
Laurent Destailleur
27785323ae
Merge pull request #6164 from hregis/4.0_bug
...
Fix: missing date locale and date rfc
2016-12-18 10:57:29 +01:00
Laurent Destailleur
12e919b99d
Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin
...
Fix user right write margin
2016-12-18 10:53:34 +01:00
Laurent Destailleur
78bf209119
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6
2016-12-18 02:21:57 +01:00
Laurent Destailleur
394e284a4a
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/class/CMailFile.class.php
htdocs/langs/en_US/errors.lang
2016-12-18 02:16:40 +01:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Laurent Destailleur
c5db333af8
Fix translation of error message when sending email
2016-12-17 14:00:39 +01:00
Gustavo Novaro
7728576f19
var to public
...
Improve code style
2016-12-17 03:49:28 -03:00
Alexis Algoud
f0ea610401
change date value
2016-12-16 17:06:05 +01:00
Alexis Algoud
41ddaf5d9b
fix but major bug on date name, as to seach a solution
2016-12-16 16:28:10 +01:00
Alexis Algoud
79867a85d0
fix list issue
2016-12-16 16:09:02 +01:00
Laurent Destailleur
c750ba8b99
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/install/mysql/data/llx_c_payment_term.sql
htdocs/langs/en_US/bills.lang
htdocs/langs/en_US/mails.lang
2016-12-16 13:56:55 +01:00
Alexis Algoud
4d375bcf95
debug translate
2016-12-16 11:31:14 +01:00
Alexis Algoud
1596760d21
fix regulate / apply new PMP / add or remove line
2016-12-15 17:02:20 +01:00
phf
cca7967144
Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin
2016-12-15 16:19:54 +01:00
Gustavo Novaro
54b433ff6b
Replace attributes var for public
...
Improve code style.
2016-12-15 09:54:45 -03:00
Alexis Algoud
9f6f874655
fix
2016-12-15 12:33:26 +01:00
Laurent Destailleur
8f3ce46c50
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f
Better fix to add server name into email id.
2016-12-15 12:11:39 +01:00
phf
21a648a052
Fix user right on margin module to write buyprice
2016-12-15 12:01:46 +01:00
Alexis Algoud
81b01cd055
fix
2016-12-15 11:23:13 +01:00
Alexis Algoud
703b8708e3
fix create
2016-12-15 10:39:59 +01:00
Alexis Algoud
a463759ba3
init query builder into db
2016-12-14 16:54:05 +01:00
Alexis Algoud
565bcf2332
debug fetch method
2016-12-14 16:11:37 +01:00
BENKE Charlie
2cebeb72aa
FIX navigation field is always ref
2016-12-14 15:04:07 +01:00
Alexis Algoud
a636d27ccb
Div
2016-12-14 14:34:12 +01:00
Laurent Destailleur
ecab7cb70e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/class/product.class.php
2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-14 12:21:33 +01:00
Laurent Destailleur
e4dd020887
Fix bad concat
2016-12-14 11:23:55 +01:00
Laurent Destailleur
af407a094a
FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of
...
tracking email.
2016-12-14 11:20:44 +01:00
Alexis Algoud
efc22a4cd8
include default list conception
2016-12-13 09:49:59 +01:00
Regis Houssin
337509d40f
Fix: missing date locale and date rfc
2016-12-13 09:40:08 +01:00
Alexis Algoud
baf1acb4fd
debug
2016-12-13 09:17:43 +01:00
Laurent Destailleur
d2d0e66c5c
Fix style fo ECM module
2016-12-13 01:19:33 +01:00
Laurent Destailleur
902169cb66
Can sort on position on list of documents
2016-12-13 00:40:12 +01:00
Laurent Destailleur
e1a5a90f0a
NEW Uploaded files are indexed into database
2016-12-13 00:15:21 +01:00
Alexis Algoud
dfb9ae234c
debug
2016-12-12 19:03:02 +01:00
Alexis Algoud
cdfbed5d08
new listview
2016-12-12 17:36:22 +01:00
Alexis Algoud
a7813c37a1
init inventory integration
2016-12-12 12:36:00 +01:00
Laurent Destailleur
0c84a0f9af
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-11 22:10:34 +01:00
Laurent Destailleur
6c4f15df63
Fix lot of fix in css look to match v5 rules.
2016-12-11 16:11:42 +01:00
aspangaro
b7babb8a48
Problem of traduction
2016-12-11 14:13:48 +01:00
Laurent Destailleur
190f432c23
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-11 11:07:22 +01:00
Laurent Destailleur
4969af8c74
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
ChangeLog
htdocs/product/card.php
2016-12-11 11:04:15 +01:00
Laurent Destailleur
9b436ce871
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/product/class/product.class.php
2016-12-11 02:51:32 +01:00
Maxime Kohlhaas
f7524b93ad
Actualize currency on supplier order and invoice
2016-12-11 02:50:21 +01:00
Maxime Kohlhaas
177ec97689
Actualize currency on propal, order and invoice
2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
7c82b18da0
New : allow to actualize currency rate
2016-12-10 22:07:25 +01:00
Maxime Kohlhaas
1f48e0486f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug
2016-12-10 21:50:31 +01:00
Maxime Kohlhaas
eb8f89119f
Dynamic select currency
2016-12-10 16:20:37 +01:00
Laurent Destailleur
50bc65ce77
Add css to help debug
2016-12-10 13:05:38 +01:00
Regis Houssin
239e42faa0
Fix: contract use "total_vat" instead "total_tva"
2016-12-09 13:04:05 +01:00
Laurent Destailleur
d23604701c
Fix responsive
2016-12-07 15:00:20 +01:00
Laurent Destailleur
083aef9b90
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-07 14:27:07 +01:00
Laurent Destailleur
1583d0e49f
Fix linkof mass action for pdf merge
2016-12-07 14:14:03 +01:00
Laurent Destailleur
9efcda6714
Merge pull request #6086 from fappels/develop-work-on-warehouse-status
...
New continue work on warehouse status #5115
2016-12-07 13:06:07 +01:00
Laurent Destailleur
c2bee0f937
FIX #6088
2016-12-07 12:44:56 +01:00
Laurent Destailleur
455a9ed4da
FIX security in import of files
2016-12-07 12:41:48 +01:00
fappels
085d44eaba
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-06 20:15:45 +01:00
fappels
bbbc768fa7
Change filter parameter to string with comma seperated values
...
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
2016-12-06 20:07:19 +01:00
Laurent Destailleur
017e384f16
FIX Preselected value for extrafield link was not correctly set
2016-12-06 13:10:44 +01:00
fappels
c911f906c8
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-12-05 11:36:20 +01:00
Laurent Destailleur
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +01:00
fappels
af5eb00933
Ignore filtering if service
2016-12-02 12:18:36 +01:00
fappels
b21fd14a11
Ignore Service, only filter warehouse if parameter set
2016-12-02 12:17:33 +01:00
fappels
2d4807190e
Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status
2016-11-30 13:03:24 +01:00
fappels
49442c0b7f
Add filter on warehouse status to object line product list
2016-11-30 13:03:17 +01:00
Laurent Destailleur
874bb488da
Fix bad comment
2016-11-29 23:42:56 +01:00
Laurent Destailleur
bd8f923cee
Several fixes in filter on lists
2016-11-29 22:52:16 +01:00
gauthier
9a1309256d
Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received
2016-11-28 17:13:09 +01:00
Laurent Destailleur
5e5ce0043e
Debug module ECM.
2016-11-28 12:03:33 +01:00
Marcos García de La Fuente
cf0ee36150
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-11-27 18:10:01 +01:00
Laurent Destailleur
e4a8342aef
Fix div-table-form balance on all lists (solve responsive design)
2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631
Fix responsive design
2016-11-25 18:32:52 +01:00
gauthier
c433829d27
NEW : interface
2016-11-25 11:04:42 +01:00
Laurent Destailleur
60b1591f0e
Fix the notes must not be into the tooltip of ref.
2016-11-23 20:30:43 +01:00
Laurent Destailleur
2043c279b0
Merge remote-tracking branch 'origin/4.0' into develop
2016-11-20 15:47:40 +01:00
Laurent Destailleur
cb99113ab0
Css
2016-11-20 15:47:14 +01:00
Laurent Destailleur
e6894eda0e
Better responsive
2016-11-20 10:58:28 +01:00
Laurent Destailleur
b538f13efb
FIX Module gravatar was not triggered on thirdparty and contact card
2016-11-19 19:43:55 +01:00
Laurent Destailleur
e9b78db1ac
Several bug fixes:
...
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
2016-11-19 02:16:12 +01:00
Laurent Destailleur
9b88ae145b
Fix mass action when using no javascript
2016-11-17 19:04:10 +01:00
florian HENRY
afd17feffe
Merge remote-tracking branch 'origin/develop' into franck_develop
2016-11-16 09:38:50 +01:00
Laurent Destailleur
5539415354
FIX Remove hard coded value '1' for default payment term id. Use quick
...
hack by adding hidden constant to avoid this.
2016-11-15 10:43:03 +01:00
moreauf
081be37787
NEW: Add project and Hook to Loan
...
BUG: Correct discard_closed parametters management in project
2016-11-14 19:25:50 +01:00
Laurent Destailleur
381b77850c
Fix do not show cloning of virtual product if option is off
2016-11-14 02:08:41 +01:00
Laurent Destailleur
04063a62a8
Better responsive
2016-11-12 15:18:38 +01:00
Laurent Destailleur
4bcc7dc8a0
CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu
2016-11-12 14:36:52 +01:00
Laurent Destailleur
b1bd9e4930
Responsive design
2016-11-11 23:17:37 +01:00
Laurent Destailleur
cd9f1db229
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/fiche-rec.php
2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/filemanagerdol/connectors/php/config.php
htdocs/viewimage.php
2016-11-11 15:03:05 +01:00
Laurent Destailleur
360d697fc3
Add missing field to store result of email sending
2016-11-11 13:45:18 +01:00
Laurent Destailleur
b20c4bdfe4
Responsive design
2016-11-11 12:55:03 +01:00
Laurent Destailleur
ab269bd7a6
Better responsive
2016-11-11 01:15:41 +01:00
Laurent Destailleur
fe9c880984
NEW Add missing unique key on table llx_links
2016-11-10 14:24:29 +01:00
Laurent Destailleur
eaa2125373
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/card.php
htdocs/projet/class/project.class.php
htdocs/projet/list.php
2016-11-10 11:40:39 +01:00
Laurent Destailleur
cc64994f30
Better responsive design
2016-11-10 11:33:25 +01:00
Laurent Destailleur
e30622cbd8
FIX Bcc must not appears to recipient when using SMTPs lib
2016-11-09 00:10:02 +01:00
Laurent Destailleur
d1446bb7ef
NEW Show subtotal into list of linked elements
2016-11-08 19:19:30 +01:00
Laurent Destailleur
3346fb1c75
Fix can change type from url to other string
2016-11-08 17:30:48 +01:00
Laurent Destailleur
fcca3d6be1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-11-08 17:21:41 +01:00
Laurent Destailleur
6d70d39bbd
NEW Add type "url" as possible extrafield.
2016-11-08 17:21:26 +01:00
Laurent Destailleur
a28e2a7fb6
Merge pull request #5863 from benlo06/fr_total_tva
...
New: Permit to print TotalTTC price in objectline_view
2016-11-08 14:46:16 +01:00
Laurent Destailleur
9bff6f966b
NEW Can add event from the card listing events
2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994
NEW Better filtering of automatic/manually inserted events.
2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/don/document.php
2016-11-08 11:36:31 +01:00
Laurent Destailleur
b4c20f1b1a
Fix regression in creation of invoice
...
Uniformize code
2016-11-08 11:23:40 +01:00
Laurent Destailleur
9b64fbaa98
Fix having the css of extrafield on td is not enough to detect it. We
...
must have it on tr too.
2016-11-06 16:26:18 +01:00
Marcos García de La Fuente
286095f5cd
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/fourn/facture/card.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-11-06 15:01:40 +01:00
Laurent Destailleur
0fea6f22a9
Change code to reduce need of jmobile
2016-11-05 03:27:56 +01:00
Regis Houssin
718adef600
Fix: external access of fkeditor image with multicompany
2016-11-04 10:21:20 +01:00
Laurent Destailleur
59291be6e0
NEW Can filter on status on objects on the "statistics" page.
2016-11-03 19:50:04 +01:00
Laurent Destailleur
a3607fff77
Fix customer ref of shipment
2016-10-30 16:34:46 +01:00
Laurent Destailleur
b4303470f8
Fix do not update instance status if method used to update other element
2016-10-30 15:42:43 +01:00
Laurent Destailleur
3fbba59f69
Better management of status of events
2016-10-30 13:12:35 +01:00
Laurent Destailleur
aec0e79653
Normalize constant name.
2016-10-29 21:47:10 +02:00
Laurent Destailleur
e9edbba093
NEW Usage of vat code seems ok everywhere.
2016-10-29 21:02:08 +02:00
Laurent Destailleur
03b882d095
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/list.php
2016-10-29 19:12:58 +02:00
Laurent Destailleur
17c1b3f1d2
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-10-29 19:00:43 +02:00
Laurent Destailleur
cc43732c56
Responsive enhancements
2016-10-29 17:02:48 +02:00
Laurent Destailleur
32b6660f63
Uniformize code
2016-10-29 16:18:39 +02:00
Laurent Destailleur
4f5c5a2b0e
NEW Function "crop" images available on project, product and holiday
...
attachment tab.
2016-10-28 19:42:04 +02:00
Regis Houssin
d0bd1d5d36
Fix: missing path of user photo
2016-10-28 14:22:06 +02:00
Laurent Destailleur
6938b05219
Mutualize code to show files generated for mass actions
2016-10-28 12:00:30 +02:00
Laurent Destailleur
27808b7f81
Merge pull request #5915 from aspangaro/5.0-p29
...
NEW Expense report documents are now available in ECM module
2016-10-26 10:57:23 +02:00
Laurent Destailleur
7d182c286c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step1.php
htdocs/projet/tasks/time.php
2016-10-26 10:40:03 +02:00
Laurent Destailleur
5d655d47fe
Enhance css
2016-10-25 12:36:14 +02:00
Laurent Destailleur
6ef74b33c9
Uniformize code
2016-10-25 11:09:26 +02:00
Laurent Destailleur
b15535c1f1
Uniformize code
2016-10-25 02:04:46 +02:00
Laurent Destailleur
36c2b5afcd
Responsive
2016-10-24 18:43:17 +02:00
Laurent Destailleur
3b05d00163
Better responsive design
2016-10-24 12:06:33 +02:00
Benoit
a46e7d8e1a
Change inputalsopricetotalwithtax to outputalsopricetotalwithtax
2016-10-24 10:18:24 +02:00
aspangaro
d0544b0aea
Merge remote-tracking branch 'Upstream/develop' into 5.0-p29
2016-10-24 05:27:49 +02:00
aspangaro
337e9db046
New: Expense report documents are now available in ECM module
2016-10-24 05:26:19 +02:00
Laurent Destailleur
b284bdd953
NEW #5896 More complete data on event sent by email (name in title,
...
emails list in details)
2016-10-24 02:02:30 +02:00
Laurent Destailleur
35601775e0
By default we open a new tab on external url link
2016-10-22 17:05:47 +02:00
Laurent Destailleur
1c59721294
FIX Solve backup when using mysqldump that return warning
2016-10-22 16:20:51 +02:00
Laurent Destailleur
629af89986
FIX Solve backup when using mysqldump that return warning
2016-10-22 16:18:28 +02:00
Laurent Destailleur
f93bca9be9
NEW Can see/make bank conciliation from transaction list
2016-10-21 17:00:31 +02:00
Laurent Destailleur
434b3ef643
Uniformize code and look and feel
2016-10-17 17:52:58 +02:00
Laurent Destailleur
fe471c43d1
Minor css enhancement
2016-10-16 18:28:09 +02:00
Laurent Destailleur
48ce299a38
NEW Option MAIN_INFO_SOCIETE_MAIL_ALIASES to use different identities.
2016-10-15 03:45:23 +02:00
Laurent Destailleur
dfbca2d0ad
Merge pull request #5868 from olsesacl/#5830
...
NEW: #5830 Allow Generic E-mail Sender
2016-10-15 02:43:19 +02:00
Laurent Destailleur
1f6ddb485f
Fix missing module supplier proposal for external users
2016-10-14 18:22:07 +02:00
Laurent Destailleur
b134f853e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-10-13 21:25:48 +02:00
Laurent Destailleur
78e8ab64aa
Debug multicurrency
2016-10-13 21:17:46 +02:00
Sergio Sanchis Climent
8556dab68e
NEW: #5830
2016-10-13 16:44:17 +02:00
Benlo
4ebd1ff8a2
Permit to print Total TTC price in objectline
2016-10-12 12:30:22 +02:00
Laurent Destailleur
92dc385307
Merge pull request #5838 from atm-gauthier/develop_NEW_filter_by_supplier_on_replenishment_card
...
Develop new filter by supplier on replenishment card
2016-10-11 20:04:02 +02:00
BENKE Charlie
9663883ae4
Unactive user place on bottom list
...
More usefull
2016-10-10 18:15:46 +02:00
Laurent Destailleur
6489cd6164
Debug accounting module
2016-10-07 12:10:16 +02:00
gauthier
fee0a88d27
Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card
2016-10-07 09:25:18 +02:00
gauthier
18496f9159
FIX : params order
2016-10-07 09:19:10 +02:00
Laurent Destailleur
c908af6758
Merge pull request #5833 from atm-gauthier/develop_NEW_cdr_current_or_next_month
...
NEW Develop new cdr (current or next month) for payment terms.
2016-10-07 00:06:59 +02:00
Laurent Destailleur
db3e3642b0
NEW Can generate SEPA mandate for each bank account of your customers
2016-10-06 00:14:25 +02:00
Laurent Destailleur
e79a84a89b
Uniformize code
2016-10-05 21:49:04 +02:00
gauthier
ee014681b0
Merge branch 'NEW_filter_by_supplier_on_replenishment_card' of github.com:atm-gauthier/dolibarr into develop_NEW_filter_by_supplier_on_replenishment_card
2016-10-05 15:30:23 +02:00
gauthier
9c8ecdc8d8
NEW : filter by supplier on replenish.php
2016-10-05 15:06:30 +02:00
Laurent Destailleur
9ec520a37a
Fix link to on proposal
2016-10-04 20:52:15 +02:00
gauthier
b35a4eb1b2
Merge branch 'NEW_cdr_current_or_next_month' of github.com:atm-gauthier/dolibarr into develop_NEW_cdr_current_or_next_month
2016-10-04 16:01:26 +02:00
gauthier
1c98979ca1
NEW : option "Current/Next" for limit payment date (in payment terms) to use a specific day of current month or jump to same day of next month
2016-10-04 15:45:23 +02:00
Laurent Destailleur
b607fb6be2
Fix do not show link to for disabled modules
2016-10-04 12:52:00 +02:00
Laurent Destailleur
3599f2c840
Uniformize code for recurring invoices
2016-10-04 12:31:45 +02:00
Laurent Destailleur
e37e30cc39
Better responsive
2016-10-04 11:29:48 +02:00
Laurent Destailleur
7967c80179
Code comment
2016-10-03 12:16:32 +02:00
Laurent Destailleur
45a808e034
NEW Generation of document is available on member card
2016-10-03 00:08:47 +02:00
Laurent Destailleur
0d9f28bd61
Fix dash in incoterm label
2016-10-02 16:50:28 +02:00
Laurent Destailleur
f92ca518f7
Uniformize look and feel
2016-10-02 16:38:58 +02:00
Laurent Destailleur
2579cb35dd
Minor fix
2016-10-02 11:03:36 +02:00
Laurent Destailleur
e62a12ebe9
Merge pull request #5817 from atm-arnaud/FIX_develop_maxwidthonsmartphone_on_extrafields
...
Fix Extrafields edit crashed by maxwidthonsmartphone ...
2016-10-01 18:59:37 +02:00
Laurent Destailleur
ee252f549a
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
dev/skeletons/skeleton_list.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/core/lib/cron.lib.php
htdocs/core/tpl/admin_extrafields_add.tpl.php
2016-10-01 18:42:50 +02:00
Laurent Destailleur
cf7327a2a2
FIX #5750 Bug: CmailFile::server_parse enters an infinite loop if
...
$server_response is false
2016-10-01 16:41:12 +02:00
arnaud
0bb7aaa62f
Fix Extrafields edit crashed by maxwidthonsmartphone ...
2016-09-30 14:26:04 +02:00
Laurent Destailleur
5c9fa28e79
Fix search on invoice type
2016-09-29 10:38:15 +02:00
Laurent Destailleur
6232e59fd2
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-26 14:17:36 +02:00
Laurent Destailleur
fac946dbb8
FIX The email test sender in email setup was broken
2016-09-26 14:08:14 +02:00
Laurent Destailleur
48b188d200
Merge pull request #5785 from EuskalMoneta/rest-api-add-countries-and-towns
...
NEW Add Countries and Towns to the REST API.
2016-09-26 01:33:56 +02:00
Laurent Destailleur
100312aac2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/adherents/class/cotisation.class.php
2016-09-26 01:32:50 +02:00
Laurent Destailleur
ea09eb13da
Uniformize code
2016-09-26 00:10:29 +02:00
Xebax
d5ee73a1b7
Add Countries to the REST API.
2016-09-25 17:43:15 +02:00
aspangaro
2dbeeedd14
Move tab menu for subscription in member.lib
...
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
2016-09-24 06:48:40 +02:00
florian HENRY
984a56adc5
FIX : #5776
2016-09-23 10:51:31 +02:00
Laurent Destailleur
d4e324d15a
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture.php
2016-09-21 18:38:30 +02:00
Laurent Destailleur
9c12444a03
Fix size of warehouse and height of confirm box
2016-09-21 18:20:18 +02:00
Laurent Destailleur
39c4feaef7
Enhancement for usage on smartphone
2016-09-21 03:54:54 +02:00
Laurent Destailleur
133657a8c7
Uniformize code
2016-09-21 01:25:34 +02:00
Laurent Destailleur
c4c7ccc226
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/societe/note.php
htdocs/societe/rib.php
2016-09-19 14:05:16 +02:00
Laurent Destailleur
4f842fd2cb
Uniformize look and feel
2016-09-19 13:57:50 +02:00
Laurent Destailleur
079ed88119
Fix missing css
2016-09-19 13:57:18 +02:00
Laurent Destailleur
af28a67803
Uniformize look using dol_banner
2016-09-19 10:43:30 +02:00
Laurent Destailleur
c8b8e13014
Work on dol_banner for proposals.
2016-09-18 21:38:20 +02:00
Laurent Destailleur
6093dfe333
Uniformize code
2016-09-18 12:33:30 +02:00
Laurent Destailleur
72aacb81ae
NEW Can use native php and dolibarr object on pages of module website.
2016-09-16 01:13:52 +02:00
Laurent Destailleur
68b3de5b37
NEW ckeditor accept a parameter to disable all html filtering
2016-09-15 23:23:10 +02:00
Sergio Sanchis Climent
93b216e628
FIX : #5699
2016-09-15 05:18:08 +02:00
Laurent Destailleur
39d47eab18
NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment
...
term on company level.
2016-09-14 11:17:44 +02:00
phf
0cf5ee2f28
Fix clone object with "link" as extrafield
2016-09-13 10:12:55 +02:00
Laurent Destailleur
0ab377440d
Complete param of setValueFrom
2016-09-12 20:16:39 +02:00
Laurent Destailleur
5c1127fc54
NEW Enhance function setValueFrom so we can use it for "edit in form"
...
feature.
2016-09-12 20:00:47 +02:00
Laurent Destailleur
efb05fda6a
Cleaner code to avoid to log when nothing is done
2016-09-12 19:58:43 +02:00
Laurent Destailleur
1f9aa856d5
NEW the list of linked files on card does not forget external links.
2016-09-12 18:37:40 +02:00
Laurent Destailleur
5ea9fc7467
NEW Support extrafields on product lot.
2016-09-12 17:27:44 +02:00
Laurent Destailleur
9ff1809f85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/list.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/card.php
htdocs/product/stock/class/productlot.class.php
htdocs/theme/eldy/style.css.php
2016-09-12 02:05:38 +02:00
Laurent Destailleur
1bb278a587
Fix #5712
2016-09-11 23:01:04 +02:00
Laurent Destailleur
6d6eceb0ca
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
2016-09-08 11:39:38 +02:00
Laurent Destailleur
5fdca121aa
NEW Can renamed attached files on products and expense reports
2016-09-07 01:54:16 +02:00
Marcos García de La Fuente
05728075d6
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
2016-09-06 21:06:33 +02:00
Laurent Destailleur
666c62af04
Fix http into https
2016-09-06 00:59:31 +02:00
Laurent Destailleur
d24045d831
NEW Editing translation GUI become easier with search translation tool.
2016-09-04 14:45:43 +02:00
Laurent Destailleur
cb27b01812
Work on feature to find a translation key
2016-09-03 18:47:04 +02:00
Laurent Destailleur
0e4b4ee321
Merge branch 'develop-external-logging' of
...
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging
Conflicts:
composer.json
2016-09-02 21:51:25 +02:00
Laurent Destailleur
524dd79198
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/bank/search.php
htdocs/core/class/html.form.class.php
htdocs/filefunc.inc.php
htdocs/projet/tasks/time.php
2016-08-31 00:16:07 +02:00
Laurent Destailleur
5e88de7e2c
Fix field customer/prospect/supplier in list of thirdparties
2016-08-28 15:21:09 +02:00
Laurent Destailleur
2e7e5151b7
Merge pull request #5463 from hregis/develop_origin
...
New: Add entity field in llx_societe_remise_except and llx_societe_remise
2016-08-28 12:23:04 +02:00
Laurent Destailleur
fac28f9589
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/sociales/charges.php
htdocs/core/boxes/modules_boxes.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
2016-08-28 02:40:20 +02:00
Regis Houssin
6e40f9e700
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/core/class/html.form.class.php
Change-Id: I87bdc02d611c2978a5a8b427f0e1b718b6453b59
2016-08-25 10:15:26 +02:00
Maxime Kohlhaas
52cbdf04c3
Allow to use textwithpicto with a custom picto
2016-08-23 11:03:47 +02:00
Laurent Destailleur
83107746ad
Fix no way to fix the ref of recurring invoice when an error was done
...
into typing.
2016-08-19 16:18:39 +02:00
Laurent Destailleur
fead7967f2
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/commande/list.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/resource/class/resource.class.php
2016-08-17 16:55:39 +02:00
Laurent Destailleur
282c50ef34
Merge pull request #5631 from atm-florian/4.0
...
FIX #5594
2016-08-17 14:08:06 +02:00
Laurent Destailleur
caa0dd75aa
Fix responsive design on small smartphone
2016-08-17 11:47:39 +02:00
florian HENRY
0ac090e959
FIX : #5629 DoliDBPgsql::query SQL Error message: ERROR: 22P02: invalid
...
input syntax for integer: ""
2016-08-16 09:07:08 +02:00
florian HENRY
3932a32399
FIX : #5629 PgSQL Interger string stylish error
2016-08-16 09:00:52 +02:00
florian HENRY
aa17564e93
FIX : #5594
2016-08-16 08:54:12 +02:00
Raphaël Doursenaud
49cb61b530
CLOSE #5627 Allowed external logging modules.
...
Removed Sentry logging.
2016-08-16 03:24:04 +02:00
Laurent Destailleur
6b6ee8795c
Button filter on boxes is at end of title line
2016-08-11 19:55:29 +02:00
florian HENRY
321814fae3
better fix for #5594
2016-08-09 15:17:19 +02:00
Laurent Destailleur
4d4fc87e2b
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/product/stock/productlot_list.php
htdocs/websites/index.php
2016-08-09 13:26:08 +02:00
florian HENRY
90cb71f341
revert better fix
2016-08-08 13:54:51 +02:00
florian HENRY
15f187c466
better test
2016-08-08 13:54:03 +02:00
florian HENRY
94487cf411
FIX #5594
2016-08-08 13:43:44 +02:00
Laurent Destailleur
bcd055b378
Move button to link to, in same part of code than code to output links.
2016-08-05 15:30:28 +02:00
Laurent Destailleur
890e6f59c8
NEW Support mass actions for proposals
2016-08-05 13:08:23 +02:00
Laurent Destailleur
e168888c59
NEW Reduce nb of picto on ref into list, merging preview and download
2016-08-05 12:20:11 +02:00
Laurent Destailleur
e1e8254bcf
Fix thumbs are using same extension than original.
2016-08-05 04:31:19 +02:00
Laurent Destailleur
544d5af49b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-05 01:15:35 +02:00
Laurent Destailleur
33d12a4492
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/admin.lang
2016-08-05 01:15:19 +02:00
Laurent Destailleur
7211542e41
Merge pull request #5569 from olsesacl/develop-show-preview-documents
...
NEW Preview documents
2016-08-05 01:13:35 +02:00
Laurent Destailleur
4e483c675e
Merge branch 'dev_add_color_on_select_product' of
...
https://github.com/atm-florian/dolibarr into
atm-florian-dev_add_color_on_select_product
Conflicts:
htdocs/core/class/html.form.class.php
2016-08-05 00:44:24 +02:00
Laurent Destailleur
26f553a1a8
Fix bad position of test
2016-08-04 12:04:43 +02:00
Laurent Destailleur
7a7e7b330f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a
NEW Link between objects can be done on both side and on all objects
2016-08-04 11:57:37 +02:00
Laurent Destailleur
e0b9496f9e
Fix link sometimes fails because of id not defined
2016-08-04 10:44:17 +02:00
florian HENRY
13f33ab9c7
syntax
2016-08-04 09:23:10 +02:00
florian HENRY
a013e84e0e
NEW : Add color regarding stock even on ajax autocompleter product
...
selector
2016-08-04 09:21:04 +02:00
Laurent Destailleur
b97223edd7
Fix: link to link to objects not visible
2016-08-03 19:01:51 +02:00
Laurent Destailleur
6ae8d26a89
Fix max width on combo of tasks
2016-08-03 00:04:38 +02:00
Laurent Destailleur
f0c75388cb
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/commande/class/api_commande.class.php
htdocs/compta/facture/class/api_invoice.class.php
htdocs/product/class/api_product.class.php
htdocs/societe/class/api_contact.class.php
htdocs/societe/class/api_thirdparty.class.php
2016-08-02 17:43:12 +02:00
Sergio Sanchis Climent
5fe0d601da
New: Preview documents
2016-08-02 03:35:22 +02:00
Laurent Destailleur
e335ce6f45
Fix bad var declared
2016-08-01 19:54:03 +02:00
Laurent Destailleur
b267402df6
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/main.lang
htdocs/societe/rib.php
2016-08-01 15:15:32 +02:00
Laurent Destailleur
51e941b9b4
Fix for option MAIN_OPTIMIZEFORTEXTBROWSER
2016-07-31 13:07:55 +02:00
Laurent Destailleur
79222c732d
Fix bad var
2016-07-31 02:56:08 +02:00
Laurent Destailleur
d60ac77ad3
NEW The autofill zip/town table option is on by default.
2016-07-30 15:49:39 +02:00
Laurent Destailleur
45e37c82cd
FIX #5539 Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/fourn/facture/list.php
2016-07-29 16:29:31 +02:00
Laurent Destailleur
b85bb8c0f8
Merge remote-tracking branch 'origin/3.9' into 4.0
...
Conflicts:
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2016-07-29 16:24:02 +02:00
Laurent Destailleur
b3cdb1f163
FIX tag for date rfc in odt substitution
2016-07-29 16:21:28 +02:00
Laurent Destailleur
9ca7f2cb66
Better support for option MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN (on by
...
default).
2016-07-28 19:02:23 +02:00
Laurent Destailleur
00118610bb
A fix to make editinplace working better
2016-07-28 15:29:46 +02:00
Laurent Destailleur
aae2086ada
Move notes on dedicated tabs like other elements.
...
Rename also the note available into translation tab into "other" to
avoid confusion because it was not the same usage.
2016-07-28 13:53:17 +02:00
Regis Houssin
6bf655c882
Merge remote-tracking branch 'dolibarr/develop' into develop_origin
...
Conflicts:
htdocs/societe/class/societe.class.php
Change-Id: I760cee3a4d7a59d6625efed8aa5dc16c9df043bb
2016-07-28 09:53:10 +02:00
Laurent Destailleur
8b3136cb96
Merge remote-tracking branch 'origin/4.0' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/en_US/admin.lang
htdocs/langs/fr_FR/companies.lang
2016-07-27 19:04:55 +02:00
Sergio Sanchis Climent
3b57727542
PHP7 warnings on project module's configuration page
2016-07-26 22:22:55 +02:00
Regis Houssin
4b8f42949c
# WARNING: head commit changed in the meantime
...
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Marcos García de La Fuente
3029fd0fe1
FIX #5540 getFormMail is not registered as addReplace hook
2016-07-25 13:18:41 +02:00
Marcos García de La Fuente
3ef3a038cf
Merge branch '3.9' into bug-5537
2016-07-25 11:50:08 +02:00
Marcos García de La Fuente
a9d75b2c91
FIX #5537 AJAX project search does not work properly
2016-07-25 11:49:04 +02:00
BENKE Charlie
415bdbe9b5
Update html.formfile.class.php
2016-07-25 11:22:53 +02:00
Marcos García de La Fuente
b1c552ee9d
Merge branch 'develop' into prod-attr
...
# Conflicts:
# htdocs/install/mysql/tables/llx_product_attribute.key.sql
# htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
2016-07-24 11:54:38 +02:00
Marcos García de La Fuente
c082505021
NEW Added product attributes feature
2016-07-24 11:27:52 +02:00
Laurent Destailleur
08d23b482b
NEW Introduce mass action "delete" on sales orders.
2016-07-23 12:17:47 +02:00
Laurent Destailleur
af09528738
NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and
...
__AMOUNT_WO_TAX__ into emails templates.
2016-07-21 20:45:30 +02:00
Laurent Destailleur
93bb929219
Merge pull request #5405 from atm-florian/dev_new_password_extrafeilds_type
...
NEW : Add new password extrafields type
2016-07-21 14:01:07 +02:00
Laurent Destailleur
058c431483
FIX The project was lost when creating the event "sent by email". Also,
...
event company "create" was not tracked by default like others.
2016-07-21 13:49:10 +02:00
Laurent Destailleur
34d1c0af72
Merge pull request #5321 from frederic34/patch-7
...
Fix quotes not required on int
2016-07-20 19:09:09 +02:00
Laurent Destailleur
e2a03d18dd
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-16 19:58:36 +02:00
Laurent Destailleur
553981426e
Several minor fixes in expense reports
2016-07-16 15:21:38 +02:00
Laurent Destailleur
6fcd9e8dbf
Merge pull request #4612 from bafbes/abb-1
...
FIX Target object does not need to have all extrafields of source object.
2016-07-15 17:41:29 +02:00
Laurent Destailleur
9ba1ca5acb
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-07-15 17:05:12 +02:00
Laurent Destailleur
1b070babc8
Merge remote-tracking branch 'origin/4.0' into develop
2016-07-15 14:23:44 +02:00
Laurent Destailleur
fdfe4d9ac5
Fix missing getFormMail as "addreplace" hook
2016-07-15 14:21:07 +02:00
Bahfir Abbes
5966170a0d
Done, thanks
2016-07-15 10:43:01 +01:00
Laurent Destailleur
a5123c06db
Save the virtualhost so we can test without entering it each time.
2016-07-14 19:42:04 +02:00
Laurent Destailleur
fabd74169f
Fix: missing 'Maximize' button on full toolbar set of ckeditor.
2016-07-14 11:46:32 +02:00
Laurent Destailleur
329bdfc9fd
FIX We must take last recent price when using several level of prices
2016-07-11 11:35:38 +02:00
Laurent Destailleur
0367cee671
FIX We must take the last recent defined price when using price level
2016-07-11 11:34:11 +02:00
Laurent Destailleur
a258663175
Fix edition of status were loosing old percent. We show it to allow user
...
to keep it if required.
2016-07-09 14:58:51 +02:00
Laurent Destailleur
93c9e81c33
Fix better size on list
2016-07-09 12:05:09 +02:00
Laurent Destailleur
d8d938e82c
Fix performance problems Enter new time spent duration becoma < 1s
...
instead of 30s with 5000 tasks.
2016-07-08 17:06:12 +02:00
Laurent Destailleur
a95335d869
Fix missing ref of task
2016-07-08 16:20:11 +02:00
Laurent Destailleur
d940cc392a
FIX Several fix to exclude WON/LOST of reporting of opportunities amount
...
(sometimes we need, sometimes not).
2016-07-08 10:59:13 +02:00
Laurent Destailleur
5ebbe02853
Fix missing trackid into parameters of hooks
2016-07-07 16:26:00 +02:00
Regis Houssin
ee02ff43d7
Fix: add entity field in llx_societe_remise_except, useful when
...
third-sharing is used with multicompany
2016-07-07 12:26:30 +02:00
florian HENRY
2d932066c7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_new_password_extrafeilds_type
2016-07-07 09:17:39 +02:00
Laurent Destailleur
f756f3db0e
Fix hook context 'all'
2016-07-07 01:23:20 +02:00
Laurent Destailleur
8505c5db09
Code comment
2016-07-06 13:26:49 +02:00
Laurent Destailleur
759b265eeb
Merge pull request #5447 from atm-florian/dev_fix5446
...
FIX #5446 Extrafields select list filter on other select list do not work
2016-07-06 11:46:21 +02:00
Laurent Destailleur
c360189d94
Code comment
2016-07-06 11:14:17 +02:00
Laurent Destailleur
b4c8822281
Fix style of text after ref on invoices
2016-07-05 16:27:14 +02:00
florian HENRY
fc2e7fb1ad
FIX #5446
2016-07-05 15:45:33 +02:00
Laurent Destailleur
525b2cf297
Fix: Edition of contract on intervention failed
2016-07-02 12:02:51 +02:00
Laurent Destailleur
59f86a12d2
Fix delete of documents generated on project.
...
Fix missin translation
2016-07-01 17:49:13 +02:00
Laurent Destailleur
62d7303d8f
Add comment
2016-07-01 03:40:48 +02:00
Laurent Destailleur
05384b2f88
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/list.php
htdocs/projet/card.php
htdocs/societe/consumption.php
2016-07-01 02:39:29 +02:00
Laurent Destailleur
29e26c2342
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/lib/sendings.lib.php
2016-07-01 02:06:30 +02:00
florian HENRY
215f397f33
Cannot reproduce 4793 still fix other bug on PgSQL
2016-06-30 17:28:13 +02:00
fmarcet
e4a2b5abb3
Fix: Incorrect document link on supplier invoices's list
2016-06-30 11:27:29 +02:00
Laurent Destailleur
dcfc385645
Fix to avoid blocking error in auto upgrade process
2016-06-29 12:26:01 +02:00
florian HENRY
52f2e228f1
Add new password extrafields type
2016-06-28 10:21:10 +02:00
Laurent Destailleur
5aa561598f
Fix exit into functions
2016-06-28 02:22:01 +02:00
Laurent Destailleur
d6e15fe8f3
Increase max size of number of product into list
2016-06-26 23:15:20 +02:00
Laurent Destailleur
f021a8ca31
FIX Bad error management into trigger of mailmanspip
2016-06-25 18:48:50 +02:00
Laurent Destailleur
2767df2e01
FIX Solve problem of sending joinded files of another email when several
...
tabs are opened on form to send emails.
2016-06-24 16:10:52 +02:00
Laurent Destailleur
6033b09344
FIX: A constructor must not return a value.
...
FIX: A topic is required to send an email (probability to be spam of
99%)
2016-06-24 15:36:20 +02:00
Laurent Destailleur
0bf0937cc6
FIX: disabled templates must be not visible.
2016-06-24 13:08:34 +02:00
Laurent Destailleur
453c6264bf
FIX: Hidden option EXPORTTOOL_CATEGORIES was not working correctly
2016-06-24 02:19:41 +02:00
Laurent Destailleur
227bdb9838
FIX extrafields was not visible on tab "subscription"
...
FIX Link between membership and invoice was not saved
2016-06-24 00:45:35 +02:00
Laurent Destailleur
d72d22cda4
Fix confusing translation
2016-06-23 23:22:30 +02:00
Laurent Destailleur
91e13d23fe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-06-23 20:20:16 +02:00
Scrutinizer Auto-Fixer
23620e3133
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-06-23 18:19:43 +00:00
Laurent Destailleur
2223ec15d1
Fix doxygen errors
2016-06-23 20:19:35 +02:00
Laurent Destailleur
4a408e76e7
Fix download of mass generated files.
2016-06-22 21:06:08 +02:00
Laurent Destailleur
52f414ad73
Fix selection of visible fields on customer and supplier lists. Filters
...
are ok now. Order of list of fields in selection is same than in output
array.
2016-06-21 15:16:33 +02:00
Laurent Destailleur
6317cb53f2
FIX Merge of 2 thirdparties when there is one common tag.
2016-06-20 15:42:16 +02:00
Laurent Destailleur
7f4e163a52
Fix scrutinizer reports
2016-06-20 02:37:02 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Laurent Destailleur
34c741bf0d
FIX CSS and responsive behaviour (feature with a menu hider is on on
...
smarpthone)
2016-06-17 16:28:16 +02:00
Laurent Destailleur
5b5b7a2bf9
FIX Bad value used for task warning delay
...
FIX Compatibility datee and date_end for warning of tasks
2016-06-15 14:05:48 +02:00
Laurent Destailleur
aed2c5cb30
Clean css
2016-06-10 18:41:18 +02:00
Frédéric FRANCE
262dcbea2c
Update commonobject.class.php
2016-06-07 18:08:33 +02:00
Laurent Destailleur
9019576394
Fix css class opacitymedium was not used everywhere.
2016-06-07 15:58:02 +02:00
Laurent Destailleur
c7065cc3b8
Minor esthetic fixes
2016-06-07 13:15:38 +02:00
Laurent Destailleur
293c8e145a
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/imports/import.php
htdocs/langs/en_US/admin.lang
2016-06-05 02:20:27 +02:00
Laurent Destailleur
c09dbe05b3
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/expensereport/card.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:25:08 +02:00
Laurent Destailleur
db2269b9dd
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/core/class/ldap.class.php
htdocs/langs/en_US/admin.lang
2016-06-05 00:12:34 +02:00
Maxime Kohlhaas
3ef9fe2c40
Fix product supplier price modification with multicompany
2016-06-04 18:10:40 +02:00
BENKE Charlie
d86f89a8fa
fix : #4853
...
append if not contact type for the element
2016-06-04 17:55:28 +02:00
phf
8ccda16ef3
Fix call function ldap_connect but not exists
2016-06-04 14:50:32 +02:00
Laurent Destailleur
bfb7923d4c
Merge pull request #5268 from atm-ph/fix_multicurrency_conf
...
Fix conf useful has been commented
2016-06-04 11:37:01 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
phf
495ce2463d
Fix switch currency on document do not get the associate rate
2016-06-04 01:13:23 +02:00
phf
cd79675f7a
Fix using extrafield type "link to object" show error on edit card
2016-06-03 21:16:25 +02:00
Laurent Destailleur
5106f40a56
Merge branch 'develop_NEW_decrease_stock_expedition_classify' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_decrease_stock_expedition_classify
Conflicts:
htdocs/expedition/class/expedition.class.php
2016-06-02 11:23:49 +02:00
Laurent Destailleur
c663ca13b8
Fix edit left menu
2016-06-01 21:41:47 +02:00
Laurent Destailleur
028ff5e84c
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
2016-06-01 17:59:50 +02:00
Laurent Destailleur
40005b8f65
FIX Missing search on barcode, only if defined
2016-06-01 12:15:54 +02:00
Laurent Destailleur
1bc6c4ffa3
Clean code
2016-05-30 20:50:49 +02:00
Laurent Destailleur
460d7ce915
FIX Split of credit note into discount page generates records not
...
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
Laurent Destailleur
22d6d9497e
Fix ambiguous test on ldap return of getAttributes
2016-05-29 11:20:12 +02:00
Laurent Destailleur
9bd9cda224
Move to HTML5
2016-05-24 16:02:43 +02:00
Laurent Destailleur
3119d77565
Add warning on deprecated param
2016-05-22 16:36:48 +02:00
Laurent Destailleur
634ebaa3b6
Fix into conf.class.php file we must use $this and not $conf
2016-05-21 16:01:14 +02:00
Laurent Destailleur
e6a78739bd
Fix translation from a key that is a numeric
2016-05-19 21:12:09 +02:00
Laurent Destailleur
901c7c9517
Link "Backtolist" was missing on products
2016-05-17 02:16:28 +02:00
Alexis Algoud
8d0e5479a0
Rename var
2016-05-14 19:22:27 +02:00
Alexis Algoud
e74e70287f
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_NEW_decrease_stock_expedition_classify
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/product/stock/replenish.php
2016-05-14 19:14:39 +02:00
Laurent Destailleur
d1d1b824b4
Better coding of #5181 . I removed need of external lib.
2016-05-13 20:20:48 +02:00
Laurent Destailleur
698b93cf1e
FIX #5179
2016-05-08 12:38:30 +02:00
Laurent Destailleur
5cf8612c58
Fix scrutinizer errors
2016-05-08 12:08:23 +02:00
Juanjo Menent
ae6e233781
Merge pull request #5176 from Dolibarr/scrutinizer-patch-3
...
Scrutinizer Auto-Fixes
2016-05-07 00:49:57 +02:00
Laurent Destailleur
d484383467
Minor errors
2016-05-06 22:06:23 +02:00
Scrutinizer Auto-Fixer
9508d8a5c0
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-05-06 19:10:59 +00:00
Laurent Destailleur
aa55cdadac
Merge pull request #4944 from FHenry/develop_advtargetemailiing
...
NEW : Advance target emailing
2016-05-05 23:18:27 +02:00
Laurent Destailleur
d2df537d43
Merge pull request #5135 from atm-alexis/develop_NEW_allow_link_project
...
NEW allow a document to be linked to project from another customer
2016-05-05 22:24:32 +02:00
Laurent Destailleur
461f62c200
Use the new global search form
2016-05-05 13:29:42 +02:00
Florian HENRY
3d57e83094
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-05-02 20:40:42 +02:00
Florian HENRY
fda5e6002f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/websites/index.php
2016-05-02 20:27:34 +02:00
abb
23c0a0a64e
conflict solved Merge branch 'develop' into abb-14
...
Conflicts:
htdocs/langs/en_US/companies.lang
2016-05-02 01:28:46 +01:00
abb
9ba129aa0c
Merge branch 'develop' into abb-1
2016-05-02 01:17:27 +01:00
Laurent Destailleur
46e2ed2810
NEW: All variant of ckeditor config can be tested into the setup page of
...
module.
2016-05-01 20:36:42 +02:00
Laurent Destailleur
f59f3032c6
NEW: Rename path for generic medias files into '/medias' instead of
...
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
2016-05-01 16:34:50 +02:00
Laurent Destailleur
6a123c91b5
Solve warnings that appears because code is using statically a mehtod
...
that can't be static yet.
2016-04-30 19:30:28 +02:00
Laurent Destailleur
97bf91cc5d
Show both currency symbol and code
2016-04-30 14:09:00 +02:00
Laurent Destailleur
0cde6ad98f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2016-04-29 20:43:42 +02:00
Laurent Destailleur
3d9456b202
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/facture/list.php
2016-04-29 20:42:35 +02:00
Laurent Destailleur
53386e22ea
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/expedition/class/expedition.class.php
htdocs/index.php
2016-04-29 20:39:17 +02:00
Laurent Destailleur
0735413e7c
Merge pull request #5101 from altatof/fix_fournprice_select
...
FIX: end of select when no fournprice
2016-04-29 20:36:44 +02:00
BENKE Charlie
31a9acc77d
</option> not present in some select list
2016-04-29 20:18:26 +02:00
Laurent Destailleur
db4024035e
Merge pull request #5092 from defrance/patch-1
...
</option> not present in some select list
2016-04-29 20:17:56 +02:00
esprit libre
f5a541d469
Fix problem about unit buy price fetching
...
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
2016-04-29 19:41:47 +02:00
Laurent Destailleur
b17b30f5a2
Merge pull request #5114 from esprit-libre/develop
...
FIX When buy price not explicetly defined, it is return by defineBuyPrice function that return total price instead of unit price
2016-04-29 19:40:29 +02:00
Alexis Algoud
e5b6d39e51
NEW allow a document to be linked to project from another customer on config
2016-04-29 18:04:59 +02:00
Florian HENRY
6ff71792a0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-29 09:00:42 +02:00
Laurent Destailleur
2ea5bf3d5e
FIX: Pre selected value was not used on supplier list ouput
2016-04-28 20:04:48 +02:00
esprit libre
75a9178549
Fix problem about unit buy price fetching
...
To fix a bug encountered at customer shop about margin calculation. In some case, returned buy price is total buy price from provider and not unit buy price.
Case opened on forum: http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/55467-calcul-des-marges
2016-04-27 16:42:59 +02:00
Florian HENRY
1d75c5f720
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/commonobject.class.php
2016-04-27 09:41:42 +02:00
Laurent Destailleur
78cda5dc07
Fix problem with code of reccuring invoices
2016-04-26 22:00:41 +02:00
Florian HENRY
b82a216879
fix confilct
2016-04-26 14:21:40 +02:00
Florian HENRY
c7a9f26ee5
NEW : continue hidden extrafield feature
2016-04-26 14:17:19 +02:00
Alexis Algoud
b46c14812c
Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop
2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db
NEW decrease stock on expedition closing/classifying
2016-04-25 18:33:39 +02:00
Christophe Battarel
2a0c508d47
FIX: end of select when no fournprice
2016-04-25 11:26:13 +02:00
Laurent Destailleur
c73f4e5d7b
FIX Project was lost when creating invoice from a template
...
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
Laurent Destailleur
bcb4b2b607
Work on website module
2016-04-23 21:34:10 +02:00
BENKE Charlie
961c086be3
</option> not present in some select list
2016-04-23 20:17:45 +02:00
Laurent Destailleur
b639849a47
Page for proposals must be called card.php (one of last architecture
...
change before the freeze)
2016-04-23 15:37:22 +02:00
Laurent Destailleur
3278c8245b
Merge pull request #5020 from frederic34/swiftmailer
...
Add Swift Mailer to send mails
2016-04-22 20:12:58 +02:00
Laurent Destailleur
284622edbd
Merge pull request #5062 from bafbes/abb-18
...
fix:missing quote in query in commonobject updatefield function
2016-04-22 19:51:11 +02:00
Laurent Destailleur
7e047ada2b
Merge pull request #5064 from aspangaro/4.0-p21
...
FIX: Accountancy - Road to stable version
2016-04-22 19:21:18 +02:00
Laurent Destailleur
bfc5be1aad
FIX Fix and move dolGetFirstLine function into main
...
FIX Hang on ->client not defined
2016-04-22 19:07:32 +02:00
Laurent Destailleur
1de36d6501
Merge pull request #5011 from altatof/supplierorder_noprice
...
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED
2016-04-22 18:27:42 +02:00
Laurent Destailleur
a99b7ddee6
Fix PHPCS
2016-04-22 18:12:31 +02:00
Laurent Destailleur
c939273fd5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-22 13:38:56 +02:00
Laurent Destailleur
7515b2ba7b
NEW Add a parameter on graph function to show a generic graph when no
...
data are available.
2016-04-22 12:11:57 +02:00
aspangaro
8f3a254259
FIX: Bug with category functionnality
2016-04-22 06:31:40 +02:00
abb
a0f57e6a91
fix:add escape function to query in updatefield function
2016-04-21 14:49:46 +01:00
abb
4406cfcbb8
fix:missing quote in query in updatefield function
2016-04-21 14:32:51 +01:00
Laurent Destailleur
7adf3a4789
Merge pull request #5043 from bafbes/abb-15
...
new function updateExtraField to update one particular extrafield
2016-04-21 02:58:39 +02:00
Laurent Destailleur
1e5ff7388c
Merge pull request #5031 from marcosgdf/refactor-deprecated-co-client
...
NEW Removed deprecated CommonObject::client property
2016-04-21 01:49:12 +02:00
Laurent Destailleur
533391f846
Merge pull request #5030 from frederic34/patch-7
...
FIX Using $user that was not imported
2016-04-21 01:25:59 +02:00
Laurent Destailleur
30f7d4cd52
Merge pull request #5027 from marcosgdf/refactor-option
...
Refactored Form classes to use Form::selectarray instead of HTML code
2016-04-21 01:15:59 +02:00
Laurent Destailleur
08c379ad58
Fix submit photo is no more hidden on smartphone.
2016-04-19 19:15:31 +02:00
abb
62aa628524
fixmycommit:new function updateExtraField to update one particular extrafield
2016-04-19 07:49:05 +01:00
abb
f0f4933905
new function updateExtraField to update one particular extrafield
...
Conflicts:
htdocs/core/class/commonobject.class.php
2016-04-19 07:47:29 +01:00
Laurent Destailleur
a88b3a8cc4
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-18 21:02:34 +02:00
Laurent Destailleur
f68f5677bb
Start to use the vat code to identify a vat into combo list instead of
...
just "rate" and "npr".
2016-04-18 21:02:14 +02:00
frederic34
60ebc6fa11
Some correction for testconnect
2016-04-18 00:47:08 +02:00
aspangaro
b59c94e056
NEW: Accountancy - Add Result page
...
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Frédéric FRANCE
d5980a5bf8
Update html.formmail.class.php
2016-04-17 12:20:45 +02:00
frederic34
75127638a4
Embed images
2016-04-17 10:28:21 +02:00
frederic34
8428b791f8
Add logger to dump smtp dialog
2016-04-16 22:25:47 +02:00
Marcos García de La Fuente
863efcbc5d
NEW Removed unused FormOrder::selectSourcesCommande function
...
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
2016-04-16 21:33:23 +02:00
frederic34
567dc1734e
Add Swift Mailer to send mails
2016-04-16 18:15:03 +02:00
Christophe Battarel
c3d4cd85f1
NEW hidden feature: SUPPLIERORDER_WITH_NOPRICEDEFINED allow supplier
...
order even if no supplier price defined
2016-04-15 12:28:35 +02:00
Laurent Destailleur
8d46d76f96
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/facture/paiement.php
2016-04-12 15:03:19 +02:00
Laurent Destailleur
357877b1fe
Debug multicurrency and clean properties of some modules
2016-04-12 14:45:59 +02:00
Florian HENRY
8035742779
FIX fetchAllEMailTemplate
2016-04-11 14:52:22 +02:00
Marcos García de La Fuente
b2f922291f
FIX #4851 Project selector in supplier invoices shows the project label twice
...
Close #4851
2016-04-09 22:38:58 +02:00
Laurent Destailleur
acf546d982
Move a not used function into a better place.
2016-04-09 19:42:34 +02:00
Scrutinizer Auto-Fixer
051ccf30a1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 17:32:05 +00:00
Laurent Destailleur
83644dcb93
Fix errors reported by scrutinizer
2016-04-09 15:38:15 +02:00
Laurent Destailleur
475c11ca8f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-09 15:08:29 +02:00
Laurent Destailleur
724610ba5b
Quality fixes reported by scrutinizer
2016-04-09 15:07:55 +02:00
Scrutinizer Auto-Fixer
c2243909e9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-09 13:07:33 +00:00
Laurent Destailleur
5b55af4d66
NEW Mutualize code: Use one call of function "addThumbs", when possible,
...
to generate thumbs files instead of several call of "vignette" function.
2016-04-09 14:12:21 +02:00
Laurent Destailleur
cd13c942ed
FIX When editing a numeric that is not defined, we must not show 0 but
...
an empty field.
2016-04-09 10:40:56 +02:00
Laurent Destailleur
448758bbf4
Merge branch 'develop_NEW_supplier_price_reputation' of
...
https://github.com/atm-alexis/dolibarr into
atm-alexis-develop_NEW_supplier_price_reputation
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-04-08 22:01:55 +02:00
Laurent Destailleur
92f1092f5c
Fix remove warnings
2016-04-08 19:46:56 +02:00
Laurent Destailleur
80caf58866
FIX Default vat is not set correctly when an error occured and we use
...
VAT identified by a code.
2016-04-08 19:19:13 +02:00
Laurent Destailleur
cfcbc34972
FIX Default vat is not set correctly when an error occured and we use
...
VAT identified by a code.
2016-04-08 19:16:40 +02:00
Laurent Destailleur
b1c2198154
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/ajax/selectsearchbox.php
htdocs/core/lib/price.lib.php
htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
htdocs/core/modules/modCommande.class.php
htdocs/core/modules/modFacture.class.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-07 20:01:52 +02:00
Laurent Destailleur
d7f669b918
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-04-07 19:28:18 +02:00
Laurent Destailleur
39b61d6924
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/core/boxes/box_task.php
htdocs/core/lib/files.lib.php
2016-04-07 19:27:53 +02:00
Laurent Destailleur
086345490d
Generalize the set of trackid for everyemail sent by dolibarr.
2016-04-07 14:29:07 +02:00
Florian HENRY
1f723cb8d0
FIX : Template email must take care of positino column
2016-04-07 14:16:10 +02:00
Laurent Destailleur
7f129d14d7
Better responsive design
2016-04-07 14:08:38 +02:00
Laurent Destailleur
1a1dc39a6b
Mark a duplicate function as deprecated
2016-04-06 14:53:14 +02:00
Alexis Algoud
a2c5bfa72c
FIX parse error
2016-04-06 10:20:38 +02:00
Alexis Algoud
11bb4d1cfb
Show in select
2016-04-06 10:17:13 +02:00
Juanjo Menent
b59b758016
Merge pull request #4943 from atm-gauthier/NEW_multientity_for_project
...
NEW : project sharing in select_projetcs_list function
2016-04-05 17:48:23 +02:00
Laurent Destailleur
43165bab02
FIX Filter/search on extrafields on lists
...
Conflicts:
dev/skeletons/skeleton_list.php
htdocs/projet/list.php
htdocs/societe/list.php
2016-04-04 16:22:26 +02:00
Florian HENRY
344a87f970
Merge branch 'develop' into develop_advtargetemailiing
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/class/html.formaccounting.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/install/mysql/tables/llx_c_accounting_category.sql
2016-04-04 14:43:17 +02:00
gauthier
e043aebfa1
NEW : project sharing in select_projetcs_list function
2016-04-04 11:05:12 +02:00
Laurent Destailleur
cea48a8dd6
FIX bad translation language loaded
...
FIX When changing thirdparty on event card, the showempty option of
contact was lost.
FIX Bad placeholder shown on combo to select a thirdparty.
2016-04-03 20:02:02 +02:00
Juanjo Menent
8f2fb64efb
Merge pull request #4929 from aspangaro/4.0-p12
...
FIX: Problem with dolibarr installation/migration script. Range is a reserved name...
2016-04-03 16:20:31 +02:00
Florian HENRY
0ab40f11be
Merge branch 'develop' into develop_advtargetemailiing
2016-04-03 11:29:17 +02:00
Laurent Destailleur
10f639507f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:54:51 +02:00
Laurent Destailleur
066c793de2
FIX image extension must be in lower case
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-04-02 15:46:01 +02:00
Laurent Destailleur
281b06a2d3
NEW Introduce option MAIN_WEIGHT_DEFAULT_UNIT and
...
MAIN_VOLUME_DEFAULT_UNIT to force output unit for weight and volume.
2016-04-01 18:44:23 +02:00
Florian HENRY
081c7824d2
FIX : range is MySQL reserved word, cannot be used as column names
2016-04-01 14:00:14 +02:00
aspangaro
84d326e036
FIX: Problem with dolibarr installation/migration script. Range is a reserved name.
2016-04-01 06:41:49 +02:00
Laurent Destailleur
54f3005666
NEW Can select fields to show on proposal lists.
2016-03-31 11:58:05 +02:00
Laurent Destailleur
2d9c53fc26
NEW Merge all boxes "related objects" into one. This save a lot of room
...
on most card and avoid often horizontal scoll.
2016-03-30 19:18:31 +02:00
aspangaro
26e017f4ef
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/accountancy/admin/card.php
2016-03-30 06:05:38 +02:00
Laurent Destailleur
ff96ebf381
Enahnce navigation
2016-03-29 22:09:13 +02:00
aspangaro
c9271e04a0
Merge remote-tracking branch 'Upstream/develop' into 4.0-p9
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-03-29 19:54:41 +02:00
Laurent Destailleur
4d37c47990
NEW Can select language from combo list on page to overwrite a
...
translation
2016-03-29 18:05:03 +02:00
Laurent Destailleur
6188c3fced
NEW Introduce a predefined job to run database backup
2016-03-29 14:52:27 +02:00
aspangaro
2be979569d
Debug II
2016-03-28 21:03:47 +02:00
aspangaro
cbecb37c59
debug
2016-03-28 15:32:57 +02:00
aspangaro
436fb91901
Uniformize name of table
2016-03-28 14:50:51 +02:00
aspangaro
432cc44ab6
NEW: Accountancy - Add category
2016-03-28 13:51:19 +02:00
Laurent Destailleur
40e0347bb5
More complete dependencies
2016-03-26 12:27:34 +01:00
Laurent Destailleur
0715353960
FIX A not enabled field for list must not into fields to add
2016-03-25 19:44:18 +01:00
Laurent Destailleur
d213002892
FIX A not enabled field for list must not into fields to add
2016-03-25 19:42:42 +01:00
Laurent Destailleur
7def29301a
Merge pull request #4893 from defrance/patch-113
...
FIX : add line of separation between left menu
2016-03-25 18:21:52 +01:00
Laurent Destailleur
423120db17
Merge pull request #4876 from atm-alexis/NEW_multientity_for_project
...
# New # multientity for project
2016-03-25 18:01:45 +01:00
Laurent Destailleur
00bf8caa8c
FIX #4870
2016-03-25 17:55:58 +01:00
Laurent Destailleur
30aea901b8
Merge pull request #4855 from marcosgdf/account-oop
...
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-25 17:41:39 +01:00
BENKE Charlie
bf2d52894a
correct travis too
2016-03-25 16:48:45 +01:00
Laurent Destailleur
61bc8fc9ef
NEW Can edit value date of a vat payment after recording it.
...
Conflicts:
htdocs/compta/localtax/card.php
htdocs/core/class/html.form.class.php
2016-03-25 16:01:45 +01:00
Juanjo Menent
aa9a39cab5
NEW #3510 : Standardize module
2016-03-25 15:59:44 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Laurent Destailleur
a2e9832c8d
Revert "Corrected non-static usages of Form::multiselectarray function"
...
This reverts commit 0a53cdd88f
2016-03-25 15:34:43 +01:00
Laurent Destailleur
630f5a632d
Revert "Corrected non-static usages of Form::selectarray function"
...
This reverts commit 87cd6e1e40
2016-03-25 15:34:37 +01:00
Laurent Destailleur
68e06a4634
Revert "NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions"
...
This reverts commit 4d78932fe8
2016-03-25 15:34:23 +01:00
Laurent Destailleur
4dc6acafe0
Revert "NEW Converted Form::selectyesno to a static function"
...
This reverts commit 5a9e686bf9
2016-03-25 15:34:06 +01:00
Laurent Destailleur
2220f7f6f2
Revert "NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm"
...
This reverts commit a0926abd13
2016-03-25 15:31:28 +01:00
Laurent Destailleur
e7a02d77a6
Revert commit
2016-03-25 15:31:17 +01:00
Laurent Destailleur
8ecfca5a9e
Revert change that break compatiblity with 100% of modules
2016-03-25 15:26:46 +01:00
Laurent Destailleur
26de415b77
Revert commit that break compatibility of 100% of modules
2016-03-25 15:24:57 +01:00
Laurent Destailleur
46613cd72b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-25 14:50:00 +01:00
Laurent Destailleur
4ec41bc33b
NEW Can edit value date of a vat payment after recording it.
2016-03-25 14:49:48 +01:00
Juanjo Menent
922c57da76
NEW #3510 : Standardize module
2016-03-23 22:45:04 +01:00
Alexis Algoud
c3bdc6372d
NEW allow project to be shared across entities
2016-03-22 16:48:51 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Bahfir Abbes
a1ed41646e
moved userid parameter to end of list in getNotificationArray function
2016-03-21 19:15:01 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
a0926abd13
NEW Converted Form::formconfirm function to a static function and removed deprecated function Form::form_confirm
2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5bdc3b9a1e
NEW Converted Form::selectyesno, Form::showrefnav, Form::select_date, Form::showbarcode, Form::showfilterAndCheckAddButtons, Form::editfieldkey, Form::editfieldnav, Form::editInPlace, Form::selectMassActions to static functions
2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
5a9e686bf9
NEW Converted Form::selectyesno to a static function
2016-03-20 14:15:22 +01:00
Marcos García de La Fuente
ff6b187ef3
NEW Converted Form::showLinkedObjectBlock to a static function
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
4d78932fe8
NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions
2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
0a53cdd88f
Corrected non-static usages of Form::multiselectarray function
2016-03-20 14:15:18 +01:00
Marcos García de La Fuente
87cd6e1e40
Corrected non-static usages of Form::selectarray function
2016-03-20 14:15:17 +01:00
Laurent Destailleur
8689240b7f
Merge remote-tracking branch 'origin/3.9' into develop
2016-03-19 21:37:08 +01:00
Laurent Destailleur
af3256f84a
Fix first change to fix serious pb with vat definition when using the
...
POS.
2016-03-19 21:35:03 +01:00
Marcos García de La Fuente
1be9c53b6c
NEW Created FormBank::getIBANLabel function to get the label of "IBAN" depending on bank account country
2016-03-19 19:39:18 +01:00
Laurent Destailleur
2b1f57f01e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
dev/initdata/savedemo.sh
htdocs/filefunc.inc.php
htdocs/user/card.php
2016-03-18 11:54:14 +01:00
Laurent Destailleur
44dc07a61b
Merge pull request #4807 from bafbes/abb-13
...
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-18 02:40:27 +01:00
Laurent Destailleur
c20124e369
Merge pull request #4829 from jtisseau/starttls
...
NEW Sending email can also use the STARTTLS protocol.
2016-03-18 00:48:13 +01:00
Laurent Destailleur
7692c39879
Merge pull request #4614 from bafbes/abb-3
...
include expense reports in linked objects section and provide template for them in this section
2016-03-18 00:26:24 +01:00
philippe grand
d434cee3fa
[Qual] Typo
2016-03-17 09:40:05 +01:00
jtisseau
d7b0e41271
Added the STARTTLS connection mode
...
Adds the STARTTLS connection mode in function _server_authenticate. It's
use by Microsoft Hotmail and Exchange servers. I use the
MAIN_MAIL_EMAIL_STARTTLS const introduced in admins/mails.php retrieved
from the $conf object which is not used anywhere else in the file so it
may not be the right way to do it. Maybe this value should be passed in
constructor but it would then imply more changes around multiple files
calling smtps class.
2016-03-16 01:54:45 +01:00
abb
b6e39960b4
new:handle user notification in notification module
...
Conflicts:
htdocs/core/lib/usergroups.lib.php
2016-03-13 20:08:27 +01:00
abb
d35f728fad
added handle to trigger FICHINTER_ADD_CONTACT in notify module
2016-03-13 19:58:39 +01:00
Laurent Destailleur
a12d81cbda
Fix PHPCS
2016-03-10 12:36:25 +01:00
Laurent Destailleur
d8045e33bb
FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to
...
edit email templates
2016-03-05 12:37:09 +01:00
Laurent Destailleur
446a080c75
NEW Mutualize code to manage email substitution variables. Show
...
available variables into page to edit email templates.
2016-03-05 12:20:58 +01:00
Laurent Destailleur
109eefaf03
Merge pull request #4723 from IonAgorria/default-date-selector
...
New: Default values in date selector
2016-03-04 16:31:42 +01:00
Laurent Destailleur
cbd102fa45
Merge and rename method into camel format
2016-03-04 16:28:38 +01:00
Laurent Destailleur
6e8b176d8d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-03-04 16:24:03 +01:00
Laurent Destailleur
87093c79f9
Merge pull request #4708 from marcosgdf/account-constants
...
Started using Account TYPE and STATUS constants
2016-03-04 16:23:50 +01:00
Laurent Destailleur
fe13fe06ac
Merge pull request #4724 from frederic34/patch-7
...
Update html.formfile.class.php
2016-03-04 16:15:53 +01:00
Laurent Destailleur
36474eabec
NEW Add stats and late records into dashboard for supplier proposals.
2016-03-04 16:14:23 +01:00
Laurent Destailleur
e60088a297
Add parameter moreinheader
2016-03-04 13:30:00 +01:00
Laurent Destailleur
b75f896b45
NEW Into GED module, filename is truncated only if there is not enough
...
space into table
2016-03-04 11:25:54 +01:00
Laurent Destailleur
fba3970835
Fix missing loading lang
2016-03-04 01:09:31 +01:00
Ion Agorria
4300ca8bdc
Use isset instead of !empty in default date
2016-03-04 00:50:47 +01:00
Frédéric FRANCE
902eba67d2
Update html.formfile.class.php
2016-03-03 17:12:16 +01:00
Ion Agorria
7db306ba77
NEW: Configurable default hour and min in date selector
2016-03-03 14:51:34 +01:00
Laurent Destailleur
40144eee8d
NEW linked object can show now the recurring invoices with other linked
...
objects.
2016-03-03 13:38:16 +01:00
Laurent Destailleur
3a58613e45
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/listbyyear.php
htdocs/accountancy/journal/bankjournal.php
htdocs/compta/facture/list.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/projet/activity/index.php
2016-03-02 23:40:11 +01:00
Marcos García de La Fuente
b41016da70
Little refactor of FormBank::select_type_comptes_financiers
2016-03-02 11:12:41 +01:00
Laurent Destailleur
846d78dfba
FIX Edition of delay (nb of days) for payment term "Immediate" was
...
broken.
2016-02-29 15:43:00 +01:00
Laurent Destailleur
c197ce31b6
NEW Add the admin info on combo of type of contact
2016-02-29 13:24:59 +01:00
Laurent Destailleur
8807222f24
Fix a lot of fixes to have the french vat npr working better
2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5
Fix a lot of fixes to have the french vat npr working better
2016-02-27 11:46:16 +01:00
Laurent Destailleur
23f45c7b7e
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/commande/list.php
htdocs/core/lib/pdf.lib.php
2016-02-26 15:45:25 +01:00
Laurent Destailleur
1fa94e4d6a
NEW Introduce position of records into dictionnary of type of contacts
2016-02-26 15:03:07 +01:00
Laurent Destailleur
2e25c7969b
Fix when setting a price for a product, selection of product must not
...
show any price
2016-02-26 12:22:32 +01:00
Laurent Destailleur
b072b5a181
Fix remove some warnings
...
Conflicts:
htdocs/core/lib/pdf.lib.php
2016-02-26 10:45:25 +01:00
Laurent Destailleur
61edda61e1
Fix remove some warnings
2016-02-26 10:38:42 +01:00
Laurent Destailleur
4b4de22a54
NEW Add hook pdf_build_address
...
NEW Add option MAIN_PUBLIC_NOTE_IN_ADDRESS
2016-02-25 20:54:37 +01:00
Laurent Destailleur
371dec8503
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
htdocs/langs/en_US/products.lang
htdocs/langs/fr_FR/companies.lang
2016-02-24 12:13:12 +01:00
Laurent Destailleur
2747259fbd
Fix: missing payment term and condition into update method
2016-02-24 12:01:50 +01:00
Laurent Destailleur
28b8258acb
Fix in most cases, we don't need translated value of languages, jsut
...
list of language code.
Fix cost price was not updated.
2016-02-23 19:50:33 +01:00
Laurent Destailleur
ff9a82c96f
Merge pull request #4670 from atm-ph/new_add_multicurrency_supplier_invoice_payment
...
New add multicurrency supplier invoice payment
2016-02-22 16:26:31 +01:00
Laurent Destailleur
cfdaa0e13c
Fix missing translation
...
Fix import of state
2016-02-22 14:49:30 +01:00
Laurent Destailleur
f6d1913bb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2016-02-22 13:35:46 +01:00
Laurent Destailleur
355f091246
FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE
2016-02-22 13:28:08 +01:00
Laurent Destailleur
945eb9f094
NEW Add the event BILL_PAYED to list of supported events for module
...
notification.
2016-02-22 12:52:01 +01:00
Laurent Destailleur
0dc76fa1cd
Merge pull request #4626 from IonAgorria/hide-hourmins-2
...
Form changes to add duration info
2016-02-21 19:22:13 +01:00
Laurent Destailleur
7ff8c2c3db
FIX Missing carriage return when phone is into property ->phone
2016-02-20 02:31:42 +01:00
Laurent Destailleur
266fb14a2c
FIX Missing carriage return when phone is into property ->phone
2016-02-20 02:19:18 +01:00
phf
b7d99271f8
New add multicurrency on supplier order
2016-02-19 22:25:59 +01:00
Laurent Destailleur
7765e37101
Better support of option SOCIETE_SORT_ON_TYPEENT
2016-02-19 21:09:36 +01:00
Laurent Destailleur
9c8d69eaa9
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/init_menu_auguria.sql
htdocs/core/menus/standard/eldy.lib.php
2016-02-19 04:46:11 +01:00
Laurent Destailleur
5d2c189e0e
Fix bad place of table
2016-02-17 23:45:25 +01:00
phf
e24a35b904
New add multicurrency on supplier proposal/order
2016-02-16 23:58:21 +01:00
Laurent Destailleur
e0a0817123
Merge pull request #4623 from IonAgorria/dynamic-price-changes
...
Dynamic price corretions/changes
2016-02-16 15:11:02 +01:00
Laurent Destailleur
9d418bca7f
Merge branch 'new_add_customer_multicurrency_payment' of
...
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-16 15:06:39 +01:00
Laurent Destailleur
d8e173af03
Fix regression (class not found, css on hover broken) with try to manage
...
contrast on categories.
2016-02-16 15:01:28 +01:00
Laurent Destailleur
36b0cb5b23
NEW Merge all admin tools (system and module admin tools) into same
...
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
2016-02-16 12:50:15 +01:00
Laurent Destailleur
c78997ed23
Tons of fixes and enhancement on recurring invoice generation
2016-02-16 00:31:05 +01:00
phf
86c8998742
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment
...
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 20:53:06 +01:00
Laurent Destailleur
d715345c82
Debug
2016-02-15 15:07:57 +01:00
Laurent Destailleur
7aaae143fc
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/menus/standard/eldy.lib.php
htdocs/expedition/card.php
2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/comm/remise.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/filefunc.inc.php
htdocs/societe/price.php
2016-02-15 01:37:23 +01:00
Laurent Destailleur
1cf2b1b3af
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9
2016-02-15 01:19:57 +01:00
Laurent Destailleur
fdea892e3b
Merge pull request #4220 from bafbes/patch-11
...
NEW Can change customer on orders when hidden option COMMANDE_CHANGE_THIRDPARTY is on
2016-02-15 01:14:08 +01:00
Laurent Destailleur
e8bc88fffe
Merge branch 'new_recurring_invoice' of
...
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-15 00:45:39 +01:00
Laurent Destailleur
1cb6c7f3e9
Merge pull request #4603 from GPCsolutions/3.9-4597
...
FIX #4597 PHP 7 Uniform Variable Syntax
2016-02-15 00:32:11 +01:00
abb
7ecb263a04
Merge branch 'develop' of https://github.com/bafbes/dolibarr into dev
2016-02-15 00:20:19 +01:00
Laurent Destailleur
a9aab7545e
Merge pull request #4575 from altatof/fix_ttc_display
...
FIX: add missing global def for ttc column
2016-02-15 00:14:34 +01:00
Laurent Destailleur
3925ae0742
Fix: we loose ability to refresh contact list when changing a company on
...
contact tab
2016-02-14 23:54:07 +01:00
Ion Agorria
a72c49f57b
Form changes to add duration info
2016-02-14 22:33:44 +01:00
abb
834f0b20ae
fix:no transaction in this place
2016-02-14 20:55:09 +01:00
abb
2f99273734
fix:no transaction in this place
2016-02-14 20:51:36 +01:00
Laurent Destailleur
b7ae5bac6f
Fix: The text "All" is not appropriate.
2016-02-14 20:48:25 +01:00
Ion Agorria
89657d0439
Changed Price Parser functions and added testExpression
2016-02-14 17:28:31 +01:00
Ion Agorria
99efbd3464
Check if dynamic price is enabled
2016-02-14 16:09:47 +01:00
Laurent Destailleur
d6227fd981
Merge pull request #4611 from bafbes/abb-0
...
urgent fix : start of transaction without finish
2016-02-14 12:51:30 +01:00
Laurent Destailleur
cd3a531449
Debug multicurrency
2016-02-13 03:33:41 +01:00
abb
4dce09cd27
include expense reports in linked objects section and provide template for them in this section
...
Conflicts:
htdocs/core/class/html.form.class.php
2016-02-13 00:37:38 +01:00
abb
e1cf107096
Target object does not need to have all source object extrafields
2016-02-13 00:18:42 +01:00
abb
0063635c67
fix:no transaction in this place
2016-02-13 00:00:20 +01:00
Raphaël Doursenaud
d038ca1875
FIX #4597 PHP 7 Uniform Variable Syntax
...
PHP7 compatibility with the new Uniform Variable Syntax.
This change is compatible with both PHP 5 and PHP 7.
See: https://wiki.php.net/rfc/uniform_variable_syntax#backward_incompatible_changes
2016-02-11 20:01:51 +01:00
Laurent Destailleur
51cc252d4a
Fix: submit was no more possible from keyboard
2016-02-11 15:47:47 +01:00
phf
875e01aeee
New add recurrence fields on create form of invoice model
...
Fix missing fields in database about multicurrency
2016-02-11 09:50:35 +01:00
phf
a0cfe9aad8
New add payment with multicurrency module
2016-02-10 23:16:38 +01:00
Laurent Destailleur
ab2ac26f17
NEW When a field to show into list is selected, the form is
...
automatically submited
2016-02-10 19:27:22 +01:00
Laurent Destailleur
5ea9c6dd83
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/core/class/html.formprojet.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/accountancy.lang
2016-02-09 14:40:25 +01:00
Laurent Destailleur
f640bf7c61
Manage the reply-to field into mail libs
2016-02-09 11:56:12 +01:00
Laurent Destailleur
805940f61c
Merge pull request #4539 from bafbes/patch-22
...
Set mail reply-to field to sender in smtps class
2016-02-09 10:17:33 +01:00
Laurent Destailleur
d89daf9cd2
Work to move the merge pdf tool into the mass action combo of lists
2016-02-08 18:04:42 +01:00
Laurent Destailleur
d2708a4225
Merge pull request #4475 from atm-ph/new_multicurrency_module
...
New multicurrency module
2016-02-08 14:44:49 +01:00
Laurent Destailleur
81aae30253
NEW Add a checkbox to select/unselect all lines on page that support
...
mass actions (like invoice list page)
2016-02-07 19:55:41 +01:00
Laurent Destailleur
786f16de02
Add comment
2016-02-07 16:20:07 +01:00
Laurent Destailleur
baa6172ead
Fix look for first incoterm combo
2016-02-07 16:13:33 +01:00
Laurent Destailleur
9da0164d90
Uniformize code for lists
2016-02-07 15:50:48 +01:00
Laurent Destailleur
28c89dc3e3
Prepare the ground to have a full editable homearea page
2016-02-07 13:10:36 +01:00
Laurent Destailleur
8a8aaf618d
Fix: select to add box was lost
2016-02-07 02:22:10 +01:00
Laurent Destailleur
806d3642d8
FIX Bad filter on opportunities
...
Conflicts:
htdocs/core/class/html.formprojet.class.php
2016-02-06 15:09:57 +01:00
Laurent Destailleur
3828fe7026
FIX Bad filter on opportunities
2016-02-06 15:06:37 +01:00
Christophe Battarel
7a6c7f10a6
FIX: add missing global def for ttc column
2016-02-05 19:14:40 +01:00
Laurent Destailleur
7044e62afa
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2016-02-05 18:37:13 +01:00
Laurent Destailleur
bf7181a064
All messages separated with , into errorsToString
2016-02-05 18:37:01 +01:00
Laurent Destailleur
02c54f4ea6
Merge pull request #4573 from altatof/fix_ttc
...
FIX: retrieve correct pu_ttc (set by printObjectLine function) like in 3.7
2016-02-05 18:34:45 +01:00
Laurent Destailleur
cb66448148
Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields
...
NEW feature hidden extrafields
2016-02-05 17:22:51 +01:00
Christophe Battarel
f0aef88589
better fix
2016-02-05 13:49:19 +01:00
Laurent Destailleur
062deae24c
Merge
2016-02-05 12:18:50 +01:00
phf
32c0b2a9b1
NEW add html id/class to locate value in the DOM html
2016-02-04 21:05:19 +01:00
Frédéric FRANCE
a656607122
Update CMailFile.class.php
2016-02-04 17:12:58 +01:00
phf
0c05342934
FIX infinite loop
2016-02-03 22:54:48 +01:00
phf
75c4888364
NEW feature hidden extrafields
2016-02-03 22:49:43 +01:00
phf
1b552a0b3b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/core/class/link.class.php
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/accountancy/admin/productaccount.php
htdocs/accountancy/class/html.formventilation.class.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/menus/init_menu_auguria.sql
2016-02-03 03:27:17 +01:00
Laurent Destailleur
82cc0b409c
Merge pull request #4546 from bafbes/bra
...
provide link section in expense reports and add option for intervention
2016-02-02 16:17:25 +01:00
Laurent Destailleur
43ac8b72a3
Merge pull request #4542 from aspangaro/3.9-p9
...
New accountancy menu for auguria
2016-02-02 15:32:32 +01:00
Laurent Destailleur
64514b38da
Merge remote-tracking branch 'origin/3.9' into develop
2016-02-01 01:23:41 +01:00
Laurent Destailleur
f22373b70b
Fix bad management of option MAIN_HTML_TITLE
2016-02-01 01:19:37 +01:00
abb
773ee5c0ea
provide link section in expenses and add option for intervention
2016-01-31 19:59:47 +01:00
Laurent Destailleur
475cc24e13
NEW Can edit next execution date of a cron job.
2016-01-31 15:37:23 +01:00
Laurent Destailleur
426e9297ea
Prepare code to match cron rule: 0 if ok, !=0 if error
2016-01-31 14:20:02 +01:00
abb
2f40233e01
fix : handle case of non existing third party field in object in fecth_thirdparty function
2016-01-31 10:35:56 +01:00
aspangaro
c77fda5128
New accountancy menu for auguria
2016-01-31 07:31:48 +01:00
Bahfir Abbes
32b6f20754
Update smtps.class.php
...
Set mail reply-to field to sender
2016-01-30 17:13:58 +01:00
Laurent Destailleur
71edb3f061
Fix phpcs
2016-01-30 16:57:00 +01:00
Laurent Destailleur
19d119d3a4
Debug cron module.
...
Task to delete temporary files older than 24 is on by default.
2016-01-30 02:51:26 +01:00
Laurent Destailleur
1854f07e5c
Move code to purge files into a dedicated utils class (cron job need
...
class)
2016-01-30 00:12:58 +01:00
Laurent Destailleur
7c2ac4b3ee
NEW The probability of lead/opportunity can be defined per lead.
2016-01-28 20:04:02 +01:00
Laurent Destailleur
99b2236260
FIX Selection of project must no show closed project
2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd
Fix empty keys are not allowed into select
2016-01-28 12:19:06 +01:00
Laurent Destailleur
df4cd3de17
FIX Selection of project must no show closed project
2016-01-28 12:05:14 +01:00
Laurent Destailleur
06bbf4c966
Fix empty keys are not allowed into select
2016-01-27 21:10:42 +01:00
phf
83f90e2b1f
Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module
...
Conflicts:
htdocs/commande/card.php
2016-01-25 21:50:43 +01:00
phf
b2b787f1ff
FIX Travis
2016-01-25 21:33:14 +01:00
phf
8e933ebb2d
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module
2016-01-25 19:31:35 +01:00
Laurent Destailleur
274caf61eb
NEW Add statistics for interventions module
2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b
NEW Module "Supplier commercial proposal" (price request) is set to
...
stable status.
2016-01-25 12:33:38 +01:00
phf
963d0c396b
FIX change rate on order/invoice do not update lines
...
NEW if we change the currency on already existing propal/order/invoice the
current rate is update too then update lines
2016-01-23 21:36:07 +01:00
Laurent Destailleur
da93e35dbb
NEW Include number of linked files into badge counter of "Linked files"
...
tab.
2016-01-23 17:19:34 +01:00
Laurent Destailleur
4df584e57b
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/core/lib/files.lib.php
2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/fourn/commande/card.php
htdocs/holiday/card.php
htdocs/holiday/list.php
htdocs/user/card.php
2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/fourn/commande/card.php
2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5
Merge remote-tracking branch 'origin/3.6' into 3.7
2016-01-23 11:32:06 +01:00
phf
e86ebd6799
NEW add multicurency on customer order
2016-01-23 00:38:17 +01:00
phf
21db62d645
FIX multicurrency price always display and update line price if rate is
...
update
2016-01-22 22:35:32 +01:00
Laurent Destailleur
93b2013aa7
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/projet/tasks/list.php
2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/societe/index.php
2016-01-22 03:25:30 +01:00
phf
f7afbcff68
NEW integration of multicurrency module (creation fields in database and admin)
...
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
2016-01-21 21:38:52 +01:00
Laurent Destailleur
8e882b4cc2
NEW Add warning on tasks when they are late (add also the warning
...
tolerance parameter)
2016-01-18 15:56:51 +01:00
Laurent Destailleur
9642967c1f
NEW Indicator on workboard are red/green if late or not.
2016-01-18 12:57:24 +01:00
Laurent Destailleur
6bccac5691
NEW Add Expense report to approve into workboard
...
NEW Selection of boxes is move on top
2016-01-18 11:35:45 +01:00
Marcos García de La Fuente
da637db162
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
2016-01-18 10:17:59 +01:00
Laurent Destailleur
2f3baca9b4
Fix bad translation
2016-01-17 19:03:12 +01:00
Laurent Destailleur
7f4386f739
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-15 01:53:21 +01:00
Laurent Destailleur
6acd31f8ad
Fix: style required in create or edit mode only
2016-01-15 00:44:38 +01:00
Laurent Destailleur
85898ec977
Fix bad test
2016-01-14 23:48:47 +01:00
Laurent Destailleur
fef3bed4ba
Fix bad name of var
2016-01-14 13:32:31 +01:00
Laurent Destailleur
23e90974c4
Prepare to split module supplier into supplier_order and
...
supplier_invoice
2016-01-14 13:24:49 +01:00
Laurent Destailleur
13f10d55fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-01-13 20:42:32 +01:00
phf
d213fbae08
FIX invoice situation
2016-01-13 13:42:58 +01:00
Laurent Destailleur
d396612a7c
NEW: Add a new method for margin calculation. Added margin on "cost
...
price" to margin on WAP price and margin on "best supplier price".
2016-01-13 12:48:59 +01:00
Laurent Destailleur
6685502d5c
Fix add Croatia into list of country in EEC
2016-01-10 13:05:22 +01:00
Laurent Destailleur
e9e081bc37
Merge pull request #4292 from bafbes/patch-13
...
Include local constants files and fetch their values to the correspon…
2016-01-10 12:03:40 +01:00
Laurent Destailleur
8653e7fa5c
Merge remote-tracking branch 'origin/3.9' into develop
2016-01-10 00:12:51 +01:00
Laurent Destailleur
2764fb240f
Fix text color for category tags
...
Fix banner for category translation tab
2016-01-10 00:11:49 +01:00
Juanjo Menent
c47e18b7e2
Merge pull request #4197 from atm-ph/new_mail_input_file_multiple
...
NEW hidden conf to use input file multiple from mail form
2016-01-09 17:57:50 +01:00
Laurent Destailleur
a0d11e157b
Fix select2 component go over parent container so we introduce option to
...
deal this.
2016-01-08 23:17:45 +01:00
Laurent Destailleur
befe58ab98
Fix selection of first entry into select
2016-01-07 13:44:19 +01:00
Laurent Destailleur
4e2d4a6651
Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible.
...
Solved this by completing tooltip info.
2016-01-07 11:01:37 +01:00
Laurent Destailleur
abe3f192fa
Debug and fix when using dolibarr with jmobile
2016-01-03 16:23:23 +01:00
Laurent Destailleur
d5fa91f7ba
Fix several bugs in css and in jmobile usage
2016-01-02 20:48:19 +01:00
Laurent Destailleur
04c5516483
Fix the format "dayall" does not exists. Instead add missing format
...
"_locale" using correct language file.
2016-01-02 11:51:40 +01:00
BENKE Charlie
dbb8e49654
Update commondocgenerator.class.php
2016-01-01 12:47:27 +01:00
BENKE Charlie
b1aba4b93b
Add rfc and dayall format for extrafields date
2015-12-31 18:50:28 +01:00
Laurent Destailleur
2cbcbb8f85
Merge pull request #4319 from ParisLiakos/develop
...
FIX MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
2015-12-31 15:04:16 +01:00
Paris Liakos
b6b422042c
MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is always overriden
2015-12-29 03:43:49 +02:00
Laurent Destailleur
6f474c403c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/filefunc.inc.php
htdocs/product/list.php
htdocs/societe/notify/card.php
htdocs/societe/price.php
2015-12-27 19:15:20 +01:00
Bahfir Abbes
ce49c0d5dc
Update conf.class.php
...
I used dol_sanitizeFileName only for $file in order to not clean the two '/' characters needed in the path
2015-12-27 18:27:18 +01:00
Laurent Destailleur
5afed31265
Merge pull request #4305 from marcosgdf/bug-4036
...
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 17:37:29 +01:00
Marcos García de La Fuente
c40c695d20
FIX #4036 Direct printing module without any driver configured, shows an unformatted error message
2015-12-27 14:58:33 +01:00
Marcos García de La Fuente
686348a0d6
FIX #4287 SQL error when accessing an unexisting proposal
2015-12-25 11:47:48 +01:00
Bahfir Abbes
0027e1a8ba
Include local constants files and fetch their values to the corresponding database constants
...
Modules may declare their file constants in a file named as : "module name"_consts.php and located in the module root folder.
They may also assign a correspondence between file constants they define and their equivalent database constants in a table named $file2bddconsts defined in their constants file.
To get this two functions the module need to add its name to the list of modules in LOCAL_CONSTS_FILES.
2015-12-24 20:25:54 +01:00
Laurent Destailleur
74e8738ca7
Fix: if option to select thirdparties using a combo box after n chars
...
was on, it was no more possible to clear the filter.
2015-12-24 11:24:56 +01:00
Laurent Destailleur
ad5f65e988
Fix: use the mini image on tooltip of thirdparties
2015-12-21 17:32:57 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
Laurent Destailleur
0a515ca8c0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-12-21 12:38:23 +01:00
Laurent Destailleur
7e03aaee23
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-21 12:25:47 +01:00
Laurent Destailleur
96b6f0d8fb
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
composer.json
htdocs/product/ajax/products.php
htdocs/product/class/product.class.php
2015-12-21 12:24:24 +01:00
Laurent Destailleur
f0802eb36b
FIX #4245 PHP 7
2015-12-19 19:48:36 +01:00
Laurent Destailleur
9334cf8fd1
FIX #4243 sql injection
2015-12-19 18:03:08 +01:00
Laurent Destailleur
d7e9c92144
Fix bad link on category
...
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
Laurent Destailleur
f25a9030eb
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
.travis.yml
htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
htdocs/core/modules/commande/doc/pdf_proforma.modules.php
htdocs/includes/adodbtime/adodb-time.inc.php
htdocs/langs/en_US/accountancy.lang
2015-12-18 22:12:03 +01:00
Laurent Destailleur
98cd4f8307
Fix message so it is more clear what the feature can do or not.
...
Fix list of email templates must be hidden for templates of disabled
modules.
2015-12-18 12:48:20 +01:00
Laurent Destailleur
cdc408a84c
Fix: button "now" was not working on date using no javascript
2015-12-17 17:16:26 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
Laurent Destailleur
acc4623b74
Merge pull request #4236 from defrance/patch-90
...
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 19:25:39 +01:00
Laurent Destailleur
4ef832b94b
Merge pull request #4215 from frederic34/patch-7
...
Update sms.php
2015-12-16 19:02:07 +01:00
BENKE Charlie
afe3e6ac27
fix ErrorBadValueForParamNotAString shit one again...
2015-12-16 12:38:32 +01:00
Laurent Destailleur
3e3dbf850f
Fix: bad case for function
2015-12-15 09:44:17 +01:00
Laurent Destailleur
40269c3c70
Fix Remove syntax warnings
2015-12-15 09:43:39 +01:00
Laurent Destailleur
0ec62c05cc
Fix bad var name. Removed warning.
2015-12-14 09:14:34 +01:00
Frédéric FRANCE
1aa232c4a7
Update CSMSFile.class.php
2015-12-13 21:14:53 +01:00
Laurent Destailleur
4d11c8b733
Merge pull request #4212 from frederic34/patch-7
...
typo
2015-12-13 19:40:08 +01:00
Laurent Destailleur
646a198399
Merge pull request #4214 from frederic34/patch-8
...
typo
2015-12-13 19:39:56 +01:00
Laurent Destailleur
3b595f0247
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/accountancy/customer/list.php
htdocs/accountancy/journal/bankjournal.php
htdocs/core/lib/date.lib.php
htdocs/core/lib/report.lib.php
htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
7db6ac592f
FIX Option start tls of ldap was not correctly supported.
2015-12-13 15:51:52 +01:00
Frédéric FRANCE
9cc77787c5
typo
2015-12-12 16:10:36 +01:00
Frédéric FRANCE
442f669dc7
typo
2015-12-12 10:45:33 +01:00
Frédéric FRANCE
e193d9be97
Update CSMSFile.class.php
2015-12-10 23:08:21 +01:00
phf
2f5f6c9ead
NEW hidden conf to use input file multiple from mail form
2015-12-10 13:48:37 +01:00
Laurent Léonard
05234390f2
Fix uniqueness of objects reference
2015-12-07 02:02:03 +01:00
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
5cd43d2df0
Some debug on new features
2015-12-04 20:51:34 +01:00
Laurent Destailleur
43ab23ca28
Fix doxygen
2015-12-03 14:54:39 +01:00
Laurent Destailleur
480a398f36
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/holiday/card.php
htdocs/resource/list.php
2015-12-03 13:06:20 +01:00
Florian HENRY
10a925f7b4
FIX: WHERE 1=1
2015-12-03 11:52:41 +01:00
Florian HENRY
281eaf2987
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-03 10:27:23 +01:00
Laurent Destailleur
cb8227f086
Fix syntax error
2015-12-03 10:04:13 +01:00
Laurent Destailleur
055e650adf
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-02 23:23:38 +01:00
Laurent Destailleur
574b270da0
Work on the "mass action" feature. Can run mass action on
...
result of a select.
2015-12-02 22:00:39 +01:00
Florian HENRY
bd632cf2b0
FIX : Use "WHERE true" instead of "WHERE 1" #4132
2015-12-02 12:12:26 +01:00
Laurent Destailleur
de730c9762
NEW Introduce cost price on product.
2015-11-30 21:20:45 +01:00
Laurent Destailleur
863f81160f
Merge pull request #4116 from IonAgorria/patch-2
...
Only print : when both $h and $m are set
2015-11-30 18:54:50 +01:00
Sof
09b61fd185
Update extrafields.class.php
2015-11-30 18:06:15 +01:00
Sof
5dab92836b
FIX: Warning: implode(): Invalid arguments passed
...
Declare array type before implode to avoid warning
2015-11-30 12:27:58 +01:00
Ion Agorria
d518b24d55
Only print : when both $h and $m are set
2015-11-29 16:19:30 +01:00
Laurent Destailleur
c55d11869b
Billing of supplier or customer order is a process that can be done in
...
parallel with shipment or reception, so we show the status on another
field into lists.
2015-11-29 15:54:32 +01:00
Laurent Destailleur
ebe4867ab1
Remove useless information tomake screen lighter
2015-11-29 01:23:41 +01:00
Laurent Destailleur
263be5aa0a
Avoid 2 lines on mall screen
2015-11-29 01:16:56 +01:00
Laurent Destailleur
7b6d8dd23e
Fix for smartphone
2015-11-29 01:13:23 +01:00
Laurent Destailleur
fcdb3af708
Merge pull request #4106 from aspangaro/develop-skype
...
New: Better integration of skype for dolibarr 3.9
2015-11-28 16:31:35 +01:00
Laurent Destailleur
3485e351a4
Fix do not jump to top of page when clicking on "Link to order"
2015-11-28 15:46:20 +01:00
aspangaro
d12e3ca91f
Finish work on better integration of skype
2015-11-28 14:43:16 +01:00
phf
cbcb79b1eb
FIX jquery select of project generate js error on change event
2015-11-27 16:58:28 +01:00
aspangaro
9817ce8b20
Merge remote-tracking branch 'Upstream/develop' into develop-skype
2015-11-26 07:12:04 +01:00
Laurent Destailleur
a6d8f943df
Fix several bugs into leave requets module
2015-11-26 02:12:37 +01:00
Laurent Destailleur
b47dbc7a5f
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/install/pgsql/functions/functions.sql
htdocs/projet/element.php
2015-11-26 01:32:21 +01:00
Laurent Destailleur
f353464bce
Prepare code to fix #4095
2015-11-26 00:47:17 +01:00
aspangaro
3457a732f5
New: Better integration of skype
2015-11-25 20:19:18 +01:00
Laurent Destailleur
3aa25cd2be
Merge pull request #4064 from frederic34/escpos
...
Add profile escpos printer
2015-11-22 17:09:15 +01:00
frederic34
6b4b70bdbb
translations and help
2015-11-22 14:11:33 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
frederic34
bfd97d5226
Add profile escpos printer
2015-11-22 11:04:27 +01:00
Laurent Destailleur
6f7a3f2c66
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-21 20:00:50 +01:00
Laurent Destailleur
7b0a9fabab
FIX Order last name / firstname in user list must be done according to
...
option
2015-11-21 18:26:25 +01:00
Laurent Destailleur
7bde781206
Merge pull request #4061 from marcosgdf/bug-3231
...
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 17:58:29 +01:00
Laurent Destailleur
c8cf06c14b
Merge pull request #4059 from fappels/develop_fix_defineBuyPrice
...
Fix defineBuyPrice no min price is not error
2015-11-21 17:53:59 +01:00
philippe grand
55bab28b9c
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 17:15:56 +01:00
Marcos García de La Fuente
a456d21249
FIX #3231 [Members] Public subscription page displays GeoIP error
2015-11-21 13:25:09 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
fappels
ecd3114683
Fix defineBuyPrice no min price is not error
...
No min buy price is not error, return 0 if no buyprice set
2015-11-21 12:35:45 +01:00
philippe grand
928c44b04f
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-11-21 04:52:19 +01:00
Florian HENRY
b8af7625ff
fix new extrafields feature
2015-11-20 15:29:31 +01:00
Florian HENRY
87c9132a6d
avoid error
2015-11-20 13:59:58 +01:00
Florian HENRY
101b45e397
Continue extrafeild $ID$ and select feature
2015-11-20 13:52:47 +01:00
Florian HENRY
b8cab9f4d9
continue extrafeild $ID$ and SELECT feature
2015-11-20 13:51:57 +01:00
Florian HENRY
1566be35a1
NEW : add $ID$ into extrafields management to allow use current object
...
id on filter for select list from table and checkbox list from table
2015-11-20 11:59:28 +01:00
Florian HENRY
80f19de223
fix && vs and
2015-11-19 16:32:25 +01:00
philippe grand
4f280f63d0
[Qual] Uniformize code
2015-11-19 13:59:58 +01:00
Laurent Destailleur
6dc6bab556
Support of 'small', 'mini' and '' image size everywhere.
2015-11-17 10:38:00 +01:00
Laurent Destailleur
508b11733a
Merge pull request #4010 from atm-alexis/3.8_FIX_Allow_to_search_on_alias_name
...
FIX 3.8 allow to search on alias name into select
2015-11-16 23:48:18 +01:00
Laurent Destailleur
0e511027f6
Merge pull request #4003 from marcosgdf/bug-3996
...
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 23:41:06 +01:00
Alexis Algoud
a7d2bdc2c1
FIX 3.8 allow to search on alias name into select
2015-11-16 19:10:20 +01:00
Marcos García de La Fuente
8e9e2911ae
FIX #3996 Dictionnary hooks are not working in 3.8
2015-11-16 13:18:25 +01:00
Florian HENRY
c3b7bbfb3b
FIX : #3990
2015-11-15 20:00:11 +01:00
Laurent Destailleur
6bd6be0912
Debug and rename experimental module "supplier proposal". Still work to
...
do: Must fix the PDF to be compliant with a request quotation to a
supplier (so no need to show vat, unit price, ...).
2015-11-15 19:23:39 +01:00
Laurent Destailleur
01058be44c
NEW Introduce a "code" into fiels to describe vat. This will allow to
...
suggest different vat lines with same value with ability to
differentiate them.
2015-11-14 17:53:58 +01:00
Laurent Destailleur
5b1e20494b
Merge pull request #3977 from FHenry/3.8
...
FIX : showrefnav htmlspecialchar instead of < >
2015-11-13 19:22:41 +01:00
Florian HENRY
2a2155a239
FIX : showrefnav htmlspecialchar instead of < >
2015-11-13 14:40:52 +01:00
Laurent Destailleur
ab177b43af
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/.gitignore
htdocs/comm/mailing/card.php
htdocs/commande/list.php
htdocs/compta/facture.php
htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
phf
81a8933256
FIX autofocus on input search product
2015-11-13 10:36:32 +01:00
Laurent Destailleur
9a98206d5a
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-13 03:36:08 +01:00
Laurent Destailleur
64c783623b
NEW Framework feature. To have a page being loaded at same scrollbar
...
level wafter a click on a href link, just add the class "reposition" on
this link.
2015-11-13 03:35:55 +01:00
Laurent Destailleur
7d9fde803b
Merge pull request #3952 from atm-alexis/3.9_NEW_multityppeeventfilter
...
NEW Develop multi type event filter
2015-11-13 02:27:53 +01:00
Laurent Destailleur
4065b3f1df
Better management of the Dolibarr tracking id into email.
...
This will allow an imap scanner to link email
2015-11-13 00:19:11 +01:00
Laurent Destailleur
b2285ca5e0
Option MAIN_EMAIL_ADD_TRACK_ID is now set to 1 by default.
...
All emails sent from Dolibarr have a dedicated tracking id.
2015-11-12 21:25:01 +01:00
Alexis Algoud
d997ac83e7
Add function param description
2015-11-12 09:08:08 +01:00
Alexis Algoud
a2c8c7c20e
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-12 09:05:26 +01:00
Laurent Destailleur
2bd0f04d8f
Add feature to get nb of top menu entrie
...
Fix translation of units
2015-11-12 00:48:37 +01:00
Laurent Destailleur
1f4742b77b
Remove useles html generated code. More code comment.
2015-11-11 19:38:19 +01:00
frederic34
cd738ef483
Merge remote branch 'upstream/develop' into fccard
...
Conflicts:
htdocs/commande/card.php
2015-11-11 17:23:37 +01:00
frederic34
01d4bd6cf5
bad invert
2015-11-11 17:19:53 +01:00
Alexis Algoud
99513ac9f3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
2015-11-09 18:31:21 +01:00
frederic34
b8a84d68ec
add messages
2015-11-09 18:19:10 +01:00
Alexis Algoud
68cbd4699b
NEW multi event type for filter and get form in order to allow bookmark
2015-11-09 17:18:23 +01:00
Laurent Destailleur
71fa347e8e
FIX Better compatibility for users that used the not supported option
...
MAIN_USE_JQUERY_MULTISELECT set to 1.
2015-11-08 18:40:12 +01:00
Laurent Destailleur
6ec33a94c6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-08 15:39:10 +01:00
Laurent Destailleur
bd56396394
Fix migration error
2015-11-08 15:38:57 +01:00
Juanjo Menent
509b45a0d0
Merge pull request #3936 from marcosgdf/bug-3931
...
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
2015-11-08 11:19:13 +01:00
Laurent Destailleur
3906cb79c5
NEW: Add parameter to add a link to use "date of invoice" in one click
...
when fille a payment card.
2015-11-07 23:46:07 +01:00
Laurent Destailleur
57e162d7f8
The component selectAjaxArray can return javascript part into a global
...
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
0451cc1e73
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
...
Close #3931
2015-11-07 14:31:12 +01:00
Laurent Destailleur
b2d9f21253
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89
Use the new banner for first tab of products.
2015-11-06 18:57:35 +01:00
Maxime Kohlhaas
dac0a7bc50
Fix : finally, autofocus on product search field is a bad idea
2015-11-06 11:09:54 +01:00
Laurent Destailleur
64fb4a30bb
Merge pull request #3899 from grandoc/develop
...
Typo
2015-11-05 21:46:33 +01:00
Laurent Destailleur
f3b8df3ea5
Merge pull request #3889 from frederic34/escpos
...
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
55dfa4859f
Install lib with composer
2015-11-05 21:09:14 +01:00
frederic34
8a765bf5fd
wip
2015-11-05 16:20:35 +01:00
philippe grand
04238da75d
Typo
2015-11-05 14:16:13 +01:00
Laurent Destailleur
11b7d8a44c
Merge pull request #3873 from frederic34/escpos
...
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
frederic34
644a104d5f
start to parse template
2015-11-04 23:14:50 +01:00
frederic34
ece9f68e0c
wip
2015-11-04 20:02:04 +01:00
frederic34
4a67a94704
wip template edit
2015-11-03 23:11:04 +01:00
frederic34
5c725aceb8
sql
2015-11-03 22:12:03 +01:00
frederic34
d362d889f6
wip
2015-11-03 20:50:01 +01:00
Alexis Algoud
e3a42a78f2
FIX all PDF hook must be in addreplace type, not return value to work as expected
2015-11-03 15:14:42 +01:00
Laurent Destailleur
da0aa2f937
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
htdocs/langs/en_US/main.lang
htdocs/product/list.php
htdocs/product/stock/mouvement.php
2015-11-02 19:31:42 +01:00
Laurent Destailleur
f928062e2b
FIX #3726 Better support for PRODUCT_USE_OLD_PATH_FOR_PHOTO
2015-11-02 17:56:32 +01:00
Frédéric FRANCE
7b8a33adfe
Update commonobject.class.php
2015-11-02 13:20:51 +01:00
Laurent Destailleur
c119859696
NEW The quick search box on left menu can also search into expense
...
reports.
2015-11-02 13:14:46 +01:00
Laurent Destailleur
269fb87342
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
2015-11-02 11:46:12 +01:00
Laurent Destailleur
20a1863866
FIX IF autocomplete was set on thirdparty list, it was not possible to
...
open list of extrafields.
2015-11-02 11:45:59 +01:00
Laurent Destailleur
a9ddcc1a80
Merge pull request #3832 from frederic34/patch-16
...
NEW Add supplier order to the Direct Printing System
2015-11-02 11:27:00 +01:00
Laurent Destailleur
200e4638f4
Merge pull request #3812 from fappels/develop-best-pmp-pos-margin
...
Fix : #2591 Margin is incorrect used with POS
2015-11-02 11:06:20 +01:00
Laurent Destailleur
465ad6b3a7
Merge pull request #3802 from olsesacl/develop-hook
...
hooks correctly implemented , printObjectLine, printObjectSubLine
2015-11-02 10:44:59 +01:00
frederic34
2f3e6958f9
Receipt Printer
2015-11-01 00:58:08 +01:00
Laurent Destailleur
a8d28b5e46
NEW Add a filter field to restrict list of member when doing a LDAP list
...
request. Use also this filter into ldap command line script making sync
from ldap to dolibarr.
2015-10-30 19:23:23 +01:00
Laurent Destailleur
3760f247a2
NEW Can now select fields to show in product list. Extrafields are also
...
supported.
2015-10-30 00:05:00 +01:00
Frédéric FRANCE
b1c4e032fc
Update html.formfile.class.php
2015-10-29 19:08:38 +01:00
Florian HENRY
9a95401473
FIX : add tag myuser_job into ODT replacement
2015-10-28 11:27:39 +01:00
fappels
8992cfaeb4
move require_once
2015-10-27 15:50:55 +01:00
fappels
4d839eea60
Fix #2591 Margin is incorrect used with POS
...
if buy price not defined, define buyprice as configured in margin admin.
If 'Force buying price if null' is off, marge will be equal to suggested
default.(min supplier price or pmp)
Updated all classes reading 'Force buying price if null' setting.
2015-10-26 20:33:42 +01:00
Sergio Sanchis Climent
990fbf3ef4
hooks correctly implemented , printObjectLine, printObjectSubLine
...
In hook can change correctly label and ref (for my module need if is posible)
2015-10-26 14:00:43 +01:00
Laurent Destailleur
5c4ac0bf62
NEW Merge all left menu search boxes into one.
2015-10-26 12:18:22 +01:00
Laurent Destailleur
71da059ef0
NEW Add a new widget $form->selectArrayAjax() to use combo list with
...
content coming from an Ajax URL.
2015-10-26 11:23:31 +01:00
Laurent Destailleur
77a0359cfc
Fix bad test
2015-10-25 20:17:43 +01:00
Laurent Destailleur
9a4b62c279
NEW Introduce use of cache for thumbs images of users
2015-10-25 20:15:52 +01:00
Laurent Destailleur
1f1e72f2b6
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/facture/list.php
htdocs/main.inc.php
2015-10-25 19:54:41 +01:00
Laurent Destailleur
4e206fa80b
Fix doxygen
2015-10-25 19:53:59 +01:00
Laurent Destailleur
d7761ece58
FIX The thumb of user into top menu was using the image in full size.
...
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:54 +01:00
Laurent Destailleur
48ed8d4408
FIX The thumb of user into top menu was using the image in full size.
...
This make a large download at each page call. We must use the mini
thumbs.
2015-10-25 19:42:00 +01:00
Laurent Destailleur
b49d63c12f
NEW Show photo of user into user list. A new function
...
getImageFileNameForSize was also introduced to choose image best size
according to usage to save bandwith.
2015-10-25 19:31:42 +01:00
Laurent Destailleur
461771d488
Currency is on title only.
2015-10-24 21:20:32 +02:00
Laurent Destailleur
a01a85c3f6
FIX tag object_total_vat_x need x to be a string with unknown decimal
...
lenght. Now use for x the real vat real with no more decimal (x = 20 or
x = 8.5 or x = 5.99, ...)
2015-10-23 15:13:02 +02:00
Laurent Destailleur
8d24adc97e
Remove 2 other duplicated pages. There is only one page now for all list
...
of thirdarties (with a parameter type to have it specialized per
customer, prospect or supplier profile).
2015-10-23 13:52:51 +02:00
Laurent Destailleur
531ef43a27
Some minor look fixes.
2015-10-22 19:13:16 +02:00
Laurent Destailleur
9f21ea58a3
A lot hooks used into PDF generation were not correctly implemented. We
...
had to fix this. The result si that
the following hook were set as hook of type "replace". This means if
your module implement such hooks, it must
return 0 to execute standard code or 1 to replace standard code (value
to output should be set into resPrints instead).
2015-10-22 17:51:05 +02:00
Laurent Destailleur
ce681081c1
Merge pull request #3776 from frederic34/patch-15
...
Set warehouse for order
2015-10-22 12:16:40 +02:00
frederic34
865e9d9738
Merge remote branch 'upstream/develop' into patch-15
...
Conflicts:
htdocs/langs/en_US/admin.lang
2015-10-22 10:28:06 +02:00
Laurent Destailleur
7daf9d10af
Work on the new selectArrayAjax widget
2015-10-21 20:50:27 +02:00
Laurent Destailleur
fd72b4a400
Work on the new selectArrayAjax widget
2015-10-21 20:43:11 +02:00
Laurent Destailleur
8306d93286
NEW Add css on column of detail lines to allow module to easily
...
manipulate fields.
2015-10-20 16:08:25 +02:00
Laurent Destailleur
f123e11c8e
Doxygen
2015-10-20 12:53:32 +02:00
Laurent Destailleur
0c6441df74
FIX Using extrafield with type "Link to object" works correctly.
2015-10-20 12:40:37 +02:00
Laurent Destailleur
22979523db
Try a fix for #3742
2015-10-20 02:34:53 +02:00
Laurent Destailleur
b5e633ef42
Size too small
2015-10-20 00:52:53 +02:00
Frédéric FRANCE
affe067ff1
Update commonobject.class.php
2015-10-19 21:09:02 +02:00
Laurent Destailleur
d71ccc4a02
NEW The free text in PDF footer can now be a HTML content. So the
...
WYSIWYG editor is on by default to edit it into module setup.
2015-10-19 14:39:55 +02:00
Laurent Destailleur
18725b554b
Option MAIN_REPLACE_TRANS_xx_XX is now completely implemented.
2015-10-19 13:23:45 +02:00
Frédéric FRANCE
6f4cfc86e8
Update notify.class.php
...
http://www.dolibarr.fr/forum/12-howto--aide/54061-probleme-sur-la-validation-des-commande-fournisseu
Fatal error: Call to a member function getFullName() on a non-object in /home/xxxx/public_html/xxxxx/htdocs/core/class/notify.class.php on line 374
2015-10-18 11:25:55 +02:00
Laurent Destailleur
8c66a7d099
Revert a bad PR. if form_confirm is replaced with formconfirm, we must
...
include a print before. It is no more included into function.
2015-10-17 02:01:13 +02:00
Laurent Destailleur
87c12717a7
NEW The thirdparties tabs, the contacts tabs and the members tabs are
...
now presented using a new top banner, saving space and using a same way
to show address, status and navigation arrows.
2015-10-16 20:16:28 +02:00
Laurent Destailleur
df0c6aa5cf
Use the new card banner for members
2015-10-16 16:14:33 +02:00
Laurent Destailleur
b3491ef4e5
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/class/propal.class.php
htdocs/compta/facture/admin/facture_cust_extrafields.php
htdocs/compta/facture/admin/facturedet_cust_extrafields.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
2015-10-16 10:12:36 +02:00
Laurent Destailleur
7f75a3da9d
NEW On list of thirdparties, user can select fields to show.
...
Make phpunit test working again localy.
Add missing columns into llx_expedition.
2015-10-15 03:29:35 +02:00
Laurent Destailleur
e9aed15bed
Work on the feature to select which field to show
2015-10-14 18:48:03 +02:00
Florian HENRY
00b610d87f
FIX : fix HTML into formconfirm box
2015-10-14 08:23:52 +02:00
Laurent Destailleur
9f0c0bfc92
NEW Introduce hidden option MAIN_REPLACE_TRANS_xx_XX to allow simple
...
replacement of translated string on the fly.
2015-10-13 13:27:44 +02:00
Laurent Destailleur
bd48ad265d
The new banner tab is also on user card now
2015-10-11 15:21:21 +02:00
Laurent Destailleur
db9d09c7a3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-11 12:28:03 +02:00
Laurent Destailleur
6ec77e2ca0
New banner card on contact card.
2015-10-11 12:27:04 +02:00
Laurent Destailleur
7b7d27920d
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/adherents/type.php
htdocs/categories/class/categorie.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/lib/tax.lib.php
htdocs/product/composition/card.php
2015-10-10 18:56:28 +02:00
Laurent Destailleur
525f9841fa
Fix doxygen
2015-10-10 18:38:22 +02:00
Laurent Destailleur
f4f7629037
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/html.form.class.php
2015-10-10 02:10:14 +02:00
Laurent Destailleur
effba68511
Start to work on a common banner for tabs (goal is to have a nicer and
...
generic part for all element)
2015-10-10 01:51:12 +02:00
Laurent Destailleur
f9485bd25b
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/extrafields.class.php
2015-10-09 20:35:17 +02:00
Laurent Destailleur
b27989d5d4
Merge pull request #3665 from altatof/fix_extrafields
...
reenable search criteria in sql clause
2015-10-09 20:32:42 +02:00
Laurent Destailleur
f29c03c922
Start to work on a multiselect component to select which fields to show
...
into dolibarr lists.
2015-10-09 16:35:14 +02:00
Laurent Destailleur
2b17cd3353
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-10-08 23:50:24 +02:00
Laurent Destailleur
0d799402d0
Work on image for "no photo" with better resolution
2015-10-08 23:50:17 +02:00
Florian HENRY
1f2a86078a
FIX : Always use type send in parameters in showCategories method
2015-10-08 11:03:08 +02:00
Laurent Destailleur
8d47a307bb
Better use of space
2015-10-06 21:52:42 +02:00
Raphaël Doursenaud
3fdd59bf0a
Fix #3666 checkbox extrafields on edit
2015-10-05 20:39:14 +02:00
Raphaël Doursenaud
41354ca00d
Added type hinting to extrafields object
2015-10-05 20:30:55 +02:00
Raphaël Doursenaud
d24f5538f9
Fix: wrong parameters order
2015-10-05 20:25:55 +02:00
Christophe Battarel
bf262c2cae
reenable search criteria in sql clause
2015-10-05 15:41:28 +02:00
Laurent Destailleur
68d4a9fc63
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/societe/list.php
2015-10-04 20:57:00 +02:00
frederic34
7f86797f73
Add contact photo
2015-10-04 17:25:46 +02:00
Laurent Destailleur
75e337e8d9
FIX select of project using ajax autocomplete option
2015-10-04 16:02:50 +02:00
Laurent Destailleur
c0c0cc2415
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/interventions.lang
htdocs/theme/md_exp/style.css.php
2015-10-03 14:28:31 +02:00
fmarcet
a585698b69
FIX: Only are showing one object linked
2015-09-29 08:49:11 +02:00
Laurent Destailleur
3f506552e3
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/theme/md_exp/style.css.php
2015-09-27 21:29:16 +02:00
Laurent Destailleur
e1b969cb90
FIX Init into bad var
2015-09-26 16:52:58 +02:00
Laurent Destailleur
a097938ce5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-09-26 16:52:09 +02:00
Laurent Destailleur
f0d39a6a92
FIX Init into bad var
2015-09-26 16:51:51 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Juanjo Menent
ad1a4c7e15
Merge pull request #3598 from GPCsolutions/formconfirm
...
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Juanjo Menent
a046bcfc9b
Merge pull request #3596 from GPCsolutions/linkedobject
...
[Qual] Fixed typo and added hinting
2015-09-26 08:47:19 +02:00
Juanjo Menent
40425d427d
Merge pull request #3593 from GPCsolutions/deprecatedclasses
...
[Qual] Constructors of deprecated classes are deprecated
2015-09-26 08:45:03 +02:00
Juanjo Menent
c726afe3bc
Merge pull request #3592 from GPCsolutions/select_users
...
[Qual] Replaced deprecated select_users()
2015-09-26 08:44:34 +02:00
Juanjo Menent
4f187d3413
Merge pull request #3588 from GPCsolutions/microtime
...
[Qual] Replaced deprecated dol_microtime_float()
2015-09-26 08:40:52 +02:00
Juanjo Menent
6999ad0a4f
Merge pull request #3587 from GPCsolutions/fiche_titre
...
[Qual] Replaced deprecated function calls.
2015-09-26 08:39:22 +02:00
Raphaël Doursenaud
485c369d55
[Qual] Replaced deprecated form_confirm()
2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
57f05e850a
[Qual] Fixed typo and added hinting
2015-09-24 20:56:50 +02:00
Raphaël Doursenaud
5f5ef43e04
[Qual] Constructors of deprecated classes are deprecated
...
This gives better deprecation hinting.
2015-09-24 20:35:59 +02:00
Raphaël Doursenaud
b0b552c378
[Qual] Replaced deprecated select_users()
2015-09-24 20:32:35 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
65340667b6
[Qual] Replaced deprecated dol_microtime_float()
2015-09-24 18:42:35 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Raphaël Doursenaud
9f2545b95d
[Qual] Replaced deprecated dol_clone by native clone
2015-09-24 17:24:40 +02:00
Florian HENRY
206d6d0f7e
FIX : avoid SQL error in getValueFrom common object when all params are
...
not send
2015-09-23 13:17:58 +02:00
Laurent Destailleur
da6a1d6629
NEW Introduce a method getDefaultCreateValueForField for developers to
...
get a default value to use for a form in create mode.
Implement it for public and private notes.
2015-09-22 13:55:31 +02:00
Laurent Destailleur
58a734cb17
Firstname only on login
2015-09-21 17:28:11 +02:00
Laurent Destailleur
0821f18712
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-18 21:50:10 +02:00
Laurent Destailleur
f72f652d98
FIX Pb into pagination scroll widget
...
FIX Style of previous-next card when using dolidroid
2015-09-18 15:51:27 +02:00
Laurent Destailleur
9d7a77f2e5
Doc comment
2015-09-18 12:03:35 +02:00
Laurent Destailleur
4195eb3366
NEW Color category is visible onto the thumb of tags on thirdparty, or
...
products cards.
2015-09-17 20:20:03 +02:00
Laurent Destailleur
27b1f2ecc6
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-17 19:52:13 +02:00
Laurent Destailleur
57521f628c
Fix bad path
2015-09-17 19:35:03 +02:00
Laurent Destailleur
b1168d223a
NEW Introduce table llx_overwrite_trans to be able to overwrite
...
translations by simple database edition.
2015-09-17 18:44:42 +02:00
Laurent Destailleur
8ff41a8ded
Enhance performance of option MAIN_OVERWRITE_TRANS_
2015-09-17 15:35:51 +02:00
Laurent Destailleur
9cbd236c8c
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/filefunc.inc.php
2015-09-16 22:09:21 +02:00
Laurent Destailleur
313d9ddacd
FIX #3534
2015-09-16 22:04:03 +02:00
Laurent Destailleur
38bae655ea
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
...
Conflicts:
htdocs/core/class/html.form.class.php
2015-09-16 21:24:51 +02:00
Laurent Destailleur
e36928fd65
FIX #3529
2015-09-16 21:23:52 +02:00
Laurent Destailleur
1b836dc31e
Merge pull request #3408 from aspangaro/develop-60
...
New: CkEditor add possibility to choose skin
2015-09-15 17:09:11 +02:00
aspangaro
5b57231c52
Fix : error skin name by default
2015-09-15 06:14:33 +02:00
aspangaro
2d2f59fe3f
Fix : Class 'Categorie' not found in core\class\html.form.class.php
2015-09-14 22:33:48 +02:00
Laurent Destailleur
b94fb9e1f3
Merge remote-tracking branch 'origin/3.8' into develop
2015-09-12 18:22:10 +02:00
Laurent Destailleur
9aec4d554b
Fix #3215 [User card] [Contact card] [Member card] Error in LDAP tab
2015-09-12 18:21:37 +02:00
Laurent Destailleur
0bfccc7255
Fix print into form to attach file must be into return.
2015-09-12 11:35:56 +02:00
Laurent Destailleur
06d19a5a40
Work on a new widget
2015-09-12 11:33:22 +02:00
Laurent Destailleur
1401debace
Fix print into form to attach file must be into return.
2015-09-11 08:32:40 +02:00
aspangaro
0055606256
Invert
2015-09-10 07:36:17 +02:00
aspangaro
3a90bfa6d3
Merge remote-tracking branch 'Upstream/develop' into develop-60
2015-09-10 06:59:23 +02:00
aspangaro
b1b7966c88
ckeditor: define the default skin when constant don't exist.
2015-09-10 06:58:20 +02:00
Laurent Destailleur
24f7100562
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/core/lib/memory.lib.php
2015-09-08 10:33:33 +02:00
Laurent Destailleur
c9264fa1bc
Fix memcached effect was lost because init was done each time.
2015-09-07 20:19:37 +02:00
Laurent Destailleur
0a6451d72c
Fix memcached effect was lost because init was done each time.
2015-09-07 20:17:05 +02:00
Laurent Destailleur
9cd5e7cafa
Fix some errors into code generator.
2015-09-07 15:03:38 +02:00
Laurent Destailleur
a44ab5168c
Save memory.
2015-09-07 12:43:25 +02:00
Laurent Destailleur
77ef046af4
Start to mutualize the builddoc and remove_file action.
2015-09-06 14:02:21 +02:00
GUERRIER Kevin
692fdbaec4
Adding Document tab into Bank Account
2015-09-04 21:29:16 +02:00
Laurent Destailleur
f57284f507
Fix stats opportunities
2015-09-01 16:52:20 +02:00
Laurent Destailleur
9aa60e1ae1
Fix remove warning
2015-08-31 19:02:14 +02:00
Laurent Destailleur
2a85fb542a
Fix phpcs
...
Sync transifex
2015-08-31 17:22:36 +02:00
Laurent Destailleur
3a32b08512
Fix filter on opportunity status
2015-08-31 15:52:54 +02:00
Laurent Destailleur
5fd6c44640
Fix error management
2015-08-31 13:00:24 +02:00
Laurent Destailleur
00b9f98c1c
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-31 12:15:20 +02:00
Laurent Destailleur
fb70fbdc06
Merge pull request #3428 from marcosgdf/bug-3426
...
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
2015-08-31 00:53:04 +02:00
Laurent Destailleur
1e3bc9f822
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/salaries/index.php
htdocs/contact/class/contact.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/lib/geturl.lib.php
htdocs/core/lib/pdf.lib.php
2015-08-30 21:20:50 +02:00
aspangaro
e4bac2adfd
Merge remote-tracking branch 'Upstream/develop' into develop-57
...
Conflicts:
htdocs/install/mysql/migration/3.8.0-3.9.0.sql
2015-08-30 07:39:45 +02:00
Marcos García de La Fuente
b953d2c466
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
...
Close #3426
2015-08-29 19:42:51 +02:00
Juanjo Menent
25fca6615a
Merge pull request #3395 from fmarcet/develop
...
NEW: Translate extrafield's labels
2015-08-28 16:44:49 +02:00
Laurent Destailleur
39cbd7629f
Fix error message during import
2015-08-27 23:49:25 +02:00
philippe grand
6952084be3
it's a mess
2015-08-27 17:23:23 +02:00
philippe grand
e9f631d2e3
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
2015-08-27 14:49:12 +02:00
philippe grand
db7defb7c3
Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'"
...
This reverts commit 2527ae263b
2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b
fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'
2015-08-27 14:28:12 +02:00
Laurent Destailleur
09355b0c7b
Fix filtering
2015-08-24 16:40:43 +02:00
Laurent Destailleur
2cf10ac05d
Fix filtering
2015-08-24 16:32:43 +02:00
Laurent Destailleur
8061ec9084
Fix translation
2015-08-24 15:59:17 +02:00
Laurent Destailleur
1a55159e35
Fix filter on prospect status
2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9
Fix the property "list" was not used.
2015-08-24 14:42:07 +02:00
aspangaro
a6701aeb69
New: CkEditor add possibility to choose skin
2015-08-23 15:39:55 +02:00
Laurent Destailleur
d409568442
Format code
2015-08-20 15:07:16 +02:00
Laurent Destailleur
936f912216
Fix filter on category
2015-08-20 04:07:07 +02:00
fmarcet
d6b84233ed
NEW: Translate extrafield's labels
2015-08-18 16:40:03 +02:00
aspangaro
bd69d37c3a
New: Add number of expense reports to pay
2015-08-17 05:29:12 +02:00
Laurent Destailleur
52240eec9a
Fix removed warnings
2015-08-15 02:44:05 +02:00
Laurent Destailleur
10d3c41358
Fix Bad value into popup
2015-08-14 20:07:11 +02:00
Laurent Destailleur
2abb90713e
Fix list of resource not visible
2015-08-14 17:35:05 +02:00
Laurent Destailleur
0226f53098
Fix When selecting another email template, the topic was not replaced.
2015-08-13 05:09:26 +02:00
Laurent Destailleur
2c791e528d
Revert "unit price not used if qty = 1"
...
This reverts commit fb25f479f2
2015-08-12 23:15:32 +02:00
Juanjo Menent
78d1dfae11
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-12 18:41:44 +02:00
Regis Houssin
ebe4969723
Fix: missing entity in cache files names
2015-08-11 10:22:06 +02:00
Maxime Kohlhaas
1cbb20c89f
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_stats_percent
2015-08-07 13:30:12 +02:00
Maxime Kohlhaas
0afd27e3c2
New : % of evolution on stats
2015-08-07 13:29:11 +02:00
Juanjo Menent
1fdf4b69f8
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-06 22:14:45 +02:00
Juanjo Menent
eb33624b99
Merge pull request #3291 from GPCsolutions/hookslogging
...
NEW: log hooks loading
2015-08-06 22:11:40 +02:00
BENKE Charlie
83c4652a16
don't display ref_fourn if it's same as ref
...
decrease size of the select list
2015-08-04 15:22:36 +02:00
BENKE Charlie
fb25f479f2
unit price not used if qty = 1
...
this line is too long for add unused information
2015-08-04 13:39:01 +02:00
Laurent Destailleur
ff8969073c
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/main.inc.php
2015-07-28 18:57:13 +02:00
Gauthier
556d01ff8a
FIX : Line break display as a block
2015-07-28 15:14:54 +02:00
Laurent Destailleur
5ca6593a57
Fix serious deadlock feature. It was possible to link with no way to
...
unlink. What if user make a bad click ? I complete feature with
reverse action to be sure to not have users with a corrupted situation.
2015-07-28 14:13:16 +02:00
Laurent Destailleur
72e7558356
Fix bad closing td
...
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
2015-07-28 12:49:29 +02:00
Laurent Destailleur
ad56cb4aa0
Fix upload of files should be possible on mobile device.
2015-07-21 18:27:34 +02:00
Gauthier
fa26b284a9
FIX : Line break display as a block
2015-07-21 16:39:00 +02:00
Raphaël Doursenaud
0d897a1307
NEW: log hooks loading
...
This will help debugging bad hooks behavior.
2015-07-20 18:30:49 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
4f5e8e2480
Fix: missing context before calling trigger.
...
Clean demo file with list of triggers.
2015-07-19 15:24:54 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Laurent Destailleur
fbc0b5b313
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/contact/vcard.php
htdocs/societe/consumption.php
2015-07-19 11:38:44 +02:00
Marcos García de La Fuente
7185cfeb84
Fix: [ bug #2715 ] Statistics page has broken layout with long thirdparty names
2015-07-18 14:48:59 +02:00
Gauthier
244d1839e4
FIX : load propal langs for availability traduction
2015-07-17 17:24:11 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
db67ab0b5e
Fix wrap into lang list.
...
Sync with transifex
2015-07-15 16:27:01 +02:00
Laurent Destailleur
e571f681a0
Fix can refuse expense report
2015-07-15 15:39:50 +02:00
Laurent Destailleur
21a5a30ade
Merge pull request #3175 from All-3kcis/develop-patch-3
...
Fix #3158 can't change date in invoices
2015-07-12 12:21:46 +02:00
Laurent Destailleur
c83cb730fc
Merge pull request #3134 from atm-alexis/NEW_add_hook_in_sendmail
...
NEW add hook in send mail
2015-07-11 20:46:01 +02:00
Laurent Destailleur
3eb6ee2030
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-09 12:29:44 +02:00
Laurent Destailleur
c28ff6c257
NEW Add status into filters of graph
2015-07-09 12:29:01 +02:00
All-3kcis
6b54180678
Fix #3158 can't change date in invoices
2015-07-08 16:04:21 +02:00
Regis Houssin
9e7cb70d63
Fix: missing shared parameters
2015-07-08 16:03:15 +02:00
Raphaël Doursenaud
5ebc84e999
[Qual] Reviewed commonobject
...
Added missing fields
Removed unused variables
Documented methods parameters
Checked return points
2015-07-06 17:03:25 +02:00
Florian HENRY
b6850e36c9
fix previous commit
2015-07-06 16:59:03 +02:00
Florian HENRY
8a36353385
FIX : when fetch_optionnal_by_label in Extrafields with $this->db cannot
...
work because this->db is never instanciated
2015-07-06 13:18:51 +02:00
Alexis ALGOUD
1277596242
Mode hook
...
in $conf->global->MAIN_DISABLE_ALL_MAILS
2015-07-06 00:51:17 +02:00
Laurent Destailleur
8eb4a208ce
Debug statistics of project module
2015-07-05 22:04:30 +02:00
Laurent Destailleur
251fedad48
NEW Can edit email template using WYSIWYG editor
2015-07-04 11:57:55 +02:00
Laurent Destailleur
56560d9379
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-04 10:49:01 +02:00
Laurent Destailleur
3520c94641
Merge pull request #3131 from atm-maxime/check_rejection
...
New : Check rejection management
2015-07-04 04:20:58 +02:00
Laurent Destailleur
5015eb8a88
Merge pull request #3126 from aspangaro/develop-patch48
...
Fix travis
2015-07-04 04:13:32 +02:00
Laurent Destailleur
9c80735310
An easier to use dictionary page to edit email template.
...
Uniformize look.
2015-07-04 03:28:52 +02:00
Laurent Destailleur
0ac43211ad
NEW: Add help tooltips on fields of dictionary edit pages.
...
Fix: visible list of tasks are for opened project only.
2015-07-04 02:08:06 +02:00
Laurent Destailleur
312281f4d4
Debug askpricesupplier
...
Try to continue work on position of menu entries.
2015-07-02 22:43:51 +02:00
Alexis Algoud
25842b3295
NEW add hook in send mail
2015-07-02 16:03:24 +02:00
Maxime Kohlhaas
84be022ee1
Merge branch 'develop' of github.com:Dolibarr/dolibarr into check_rejection
...
Conflicts:
htdocs/compta/paiement/cheque/card.php
2015-07-02 13:45:32 +02:00
aspangaro
39dbec144a
Correct travis
2015-07-02 05:15:54 +02:00
Laurent Destailleur
6ef0b8e330
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-07-01 21:17:05 +02:00
Laurent Destailleur
b766f99acc
Uniformize look.
...
Make code to manage link "Now" on calendar more generic.
2015-06-30 21:50:24 +02:00
Laurent Destailleur
57a267a30f
NEW Add hooks to allow an external module to complete list of events
...
into calendar views.
2015-06-30 17:09:52 +02:00
Laurent Destailleur
4a1dfa60a5
Uniformize code
2015-06-30 13:14:19 +02:00
Laurent Destailleur
ae5b779652
Uniformize code
2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06
NEW Add opportunity amount on project card.
2015-06-29 16:57:32 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
ce6039f7f6
NEW Replace category edition page on members with new select2 component.
2015-06-27 23:01:05 +02:00
Laurent Destailleur
9d7806f1f4
Tag class as deprecated
2015-06-27 21:26:05 +02:00
Regis Houssin
5efea745a1
Fix: Public method name must not be prefixed with an underscore
2015-06-27 20:38:11 +02:00
Regis Houssin
5ac292f9ae
Fix: Private member variable must be prefixed with an underscore
2015-06-27 20:32:19 +02:00
Regis Houssin
bf9c7c8ef9
Fix: add private/public function
2015-06-27 20:26:40 +02:00
Regis Houssin
dfae24ded9
Fix: remove unused var
2015-06-27 20:20:27 +02:00
Regis Houssin
bfe7112308
Fix: change encrypt/decrypt method for avoid division by zero
2015-06-27 19:57:35 +02:00
Laurent Destailleur
b6efa5ed11
NEW Can upload files on leave requests. Use more standard permissions.
2015-06-27 11:45:23 +02:00
Laurent Destailleur
ceb9955efc
Merge branch 'develop-patch43' of https://github.com/aspangaro/dolibarr into aspangaro-develop-patch43
...
Conflicts:
htdocs/contact/list.php
2015-06-27 02:27:34 +02:00
Maxime Kohlhaas
7486f2228d
Debug : date fields were not transmitted by formconfirm
2015-06-26 18:50:57 +02:00
Laurent Destailleur
0fe0c989ca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-26 17:36:54 +02:00
Laurent Destailleur
5584acddbd
Content of popup tooltip on contact and login link
2015-06-26 17:21:03 +02:00
Maxime Kohlhaas
17a25ed4a1
Add date option to the formconfirm formquestion
2015-06-26 17:00:24 +02:00
Laurent Destailleur
8f691138e8
NEW Can edit Background color for Top menu and Background color for
...
table title line (works only with theme menu eldy).
2015-06-26 16:21:09 +02:00
Laurent Destailleur
936c46d219
Better error/setup messages.
2015-06-26 13:18:40 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Juanjo Menent
a3b3ce9c77
Merge pull request #3101 from FHenry/3.7
...
FIX: multicompny bug with getEntites without shared test
2015-06-25 20:50:03 +02:00
Florian HENRY
9505d3a528
fix multicompny bug with getEntites without shared test
2015-06-25 17:22:37 +02:00
Raphaël Doursenaud
d6e48670e7
Allow replacing the address block
...
Since ba2c0a2651
2015-06-25 11:13:23 +02:00
Fab
3adf6b1a73
Missing space after title tag.
...
When using textwithpicto() from core/class/html.form.class.php, if you
are reading source code with firefox, you will see that a part of the
generated html is highlighted in red.
<td class="classfortooltip" title="title text"valign="top" width="14">
should be :
<td class="classfortooltip" title="title text" valign="top" width="14">
2015-06-25 08:50:48 +02:00
Laurent Destailleur
02ce0bc6af
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-06-24 18:32:56 +02:00
Laurent Destailleur
c218843cdb
FIX Save of filters into export profiles failed.
2015-06-24 18:29:29 +02:00
Laurent Destailleur
4db562c9e7
Tags are shown as thumbs into card.
2015-06-22 22:31:44 +02:00
Laurent Destailleur
bfa0f0d576
Minor look enhancement
2015-06-22 17:20:06 +02:00
Laurent Destailleur
230fd7a7e4
Debug withdraw module
2015-06-21 17:05:49 +02:00
Laurent Destailleur
d780c03651
Fix default buttone
2015-06-21 03:47:16 +02:00
Laurent Destailleur
2c5ef858d0
NEW Filter "active" by default on user list.
...
Fix label of permission of project module
2015-06-20 20:35:57 +02:00
Laurent Destailleur
a6a027f5c4
Fix several pb with javascript
2015-06-20 17:24:34 +02:00
Laurent Destailleur
bbce287892
Fix: Pdf merge tool must see only pdf files
2015-06-19 16:05:04 +02:00
Laurent Destailleur
b3c1ebf30a
Debug price per customer
2015-06-19 12:13:05 +02:00
Laurent Destailleur
20da120a49
Merge tab to upload photo and other files to same tab. This reduce
...
duplicate code and avoid users to be lost.
2015-06-19 11:19:13 +02:00
Laurent Destailleur
b5cc7ae1c8
Work on merge tab photos and attached files
2015-06-19 00:52:58 +02:00
Laurent Destailleur
fb1a3f3ea3
Rename alternative name
2015-06-16 12:04:11 +02:00
Laurent Destailleur
8b4e3096a6
Merge pull request #2412 from marcosgdf/commercial-name
...
NEW [ task #851 ] Add a new field: Commercial name
2015-06-16 11:44:03 +02:00
Laurent Destailleur
417eae9c4f
Merge remote-tracking branch 'origin/3.7' into develop
2015-06-16 11:18:51 +02:00
Marcos García de La Fuente
45ebb18367
CodeSniffer corrections
2015-06-16 07:19:31 +02:00
Marcos García de La Fuente
65d3f7968a
NEW [ task 1191 ] AJAX selector for projects
2015-06-15 10:04:36 +02:00
Marcos García
adc1998b73
Fixed undefined variable typo
2015-06-15 09:18:58 +02:00
Marcos García de La Fuente
a496606826
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/soc.php
2015-06-13 02:45:42 +02:00
Juanjo Menent
deff75d2ac
Merge pull request #3007 from hregis/develop_origin
...
Fix: possibility to show icon pdf, dot, doc, etc...
2015-06-12 21:37:07 +02:00
Laurent Destailleur
1c280a9219
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/theme/eldy/style.css.php
2015-06-12 16:29:50 +02:00
Laurent Destailleur
1a2bde14fb
FIX Better management error into the color conversion functions
2015-06-12 14:37:27 +02:00
Laurent Destailleur
ed0e6753e3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-06-12 13:09:32 +02:00
Laurent Destailleur
3678a12767
NEW Can assign a task to yourself to have it appear on timesheet
2015-06-11 18:27:59 +02:00
Regis Houssin
a51a8aff59
Fix: possibility to show pdf, dot, doc, etc...
2015-06-11 09:12:24 +02:00
Laurent Destailleur
05a653ee5f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/html.form.class.php
2015-06-08 18:21:16 +02:00
Laurent Destailleur
f9d85973aa
Merge remote-tracking branch 'origin/3.5' into 3.6
2015-06-08 18:18:37 +02:00
Laurent Destailleur
b61f7dda0b
Merge pull request #2990 from GPCsolutions/dolibarr-2985
...
Make default avatar images public to allow Gravatar proxying
2015-06-08 17:53:37 +02:00
Raphaël Doursenaud
4aee11e54b
Make default avatar images public to allow Gravatar proxying
...
Fix #2985
2015-06-08 17:23:02 +02:00
Raphaël Doursenaud
143a7d7328
Use rfc6761 example.com domain instead of domain.com in examples
...
Fix #2988
2015-06-08 17:13:23 +02:00
Raphaël Doursenaud
08c9dd358d
FIX #2983 Load gravatar avatar images securely over HTTPS
2015-06-08 15:51:41 +02:00
Laurent Destailleur
df1dfcbd8a
NEW Can filter proposal on a tag of a product
...
Enhance also the prototype test_arrays to include select form before
table.
2015-06-08 15:07:37 +02:00
Laurent Destailleur
4a18b730b5
Fix: Avoid warning in expense report validation
...
Fix: navigation in expense report
2015-06-08 13:49:09 +02:00
Laurent Destailleur
b89473383c
Fix phpcs
2015-06-06 16:41:11 +02:00
Laurent Destailleur
02dbe16366
Mutualize code to show block to link an element to another one.
2015-06-06 15:57:59 +02:00
Laurent Destailleur
1652f80300
Memory optimizing. Save 2.3 Mb of memory for all forms that can show
...
margin informations. Save 300 Kb of memory for all other pages.
2015-06-06 15:19:25 +02:00
Laurent Destailleur
89f77f5e2b
Uniformize code
2015-06-06 14:21:18 +02:00
Laurent Destailleur
1880ed701f
Uniformize code
2015-06-06 13:22:15 +02:00
Laurent Destailleur
f42065146a
Start to clean html.form class.
2015-06-06 12:26:47 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1252a500ce
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/fourn/class/fournisseur.product.class.php
2015-06-05 16:50:46 +02:00
Laurent Destailleur
30f6cd08cf
Merge pull request #2943 from aspangaro/develop-donation2
...
New: Add object ot the company & Add picture cerfa logo
2015-06-05 15:58:47 +02:00
Laurent Destailleur
df60754e52
Merge pull request #2708 from GPCsolutions/deprecated
...
Deprecated
2015-06-05 15:44:08 +02:00
Laurent Destailleur
a33241f487
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:46:30 +02:00
Laurent Destailleur
5e2d9efa07
Maxi debug of 3.8. Nearly ready for freeze.
2015-06-05 14:02:50 +02:00
Laurent Destailleur
fa01dc200d
NEW Add hidden option MAIN_MAILFORM_DISABLE_ENTERKEY to disable the key
...
enter into the form to send email.
2015-06-04 12:57:49 +02:00
Laurent Destailleur
331ebbdd73
Fix behaviour on grey/visible menu must be same everywhere on
...
application.
2015-06-04 11:42:24 +02:00
Laurent Destailleur
8010cb7f33
Fix the extracss parameter was overwritten other css into
...
textwithtooltip function.
Add tooltip on THM and TJM parameter of user.
2015-06-04 10:42:12 +02:00
Laurent Destailleur
dd8a0b849a
NEW If module salaries is on, you can set a hourly value for tome
...
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
2015-06-03 21:01:50 +02:00
Laurent Destailleur
995645800e
Fix loading of project
2015-06-03 18:24:09 +02:00
Laurent Destailleur
1411772c81
Fix sql error
2015-06-03 17:07:46 +02:00
aspangaro
3461a8712a
New: Add object of the company - Needed for donation
2015-06-03 06:48:15 +02:00
Laurent Destailleur
acd693b513
Fix phpcs
2015-06-01 21:37:09 +02:00
Raphaël Doursenaud
ea798c2315
Qual: deprecate dol_json_encode() and dol_json_decode()
...
PHP > 5.3 supports json_encode() and json_decode() natively
2015-06-01 11:00:11 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
523b04a315
Work on finishing
2015-05-31 17:31:15 +02:00
Laurent Destailleur
3588d73c8e
Fix css
2015-05-31 16:36:11 +02:00
Laurent Destailleur
1b681510a5
NEW Use new select2 component for juridical status, country and state
...
selection.
2015-05-31 12:25:33 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
5e773d4cb6
Work on finishing of style
2015-05-31 01:06:51 +02:00
Laurent Destailleur
7a0ec2d831
Prototype with datatables works now also ith jmobile.
...
Add field fifo and lifo into product table.
2015-05-30 23:56:42 +02:00
Laurent Destailleur
36b7f1dcf3
NEW Show photo of logged user into login top right block.
...
NEW If no photo is available for user, we show a generic photo depending
on gender
2015-05-30 19:50:07 +02:00
Laurent Destailleur
bfe85cbf37
Better error management
2015-05-30 16:14:54 +02:00
Laurent Destailleur
13b78f9c17
NEW Add gender property managed on user card
...
FIX Better error messages when uploading photo of user when permission
to write are not granted
2015-05-30 02:17:05 +02:00
Laurent Destailleur
888bec2df3
Merge pull request #2904 from fappels/develop
...
FIX #2859 HTML units selector
2015-05-29 17:21:32 +02:00
Laurent Destailleur
0ab3cd03c0
Merge pull request #2896 from GPCsolutions/extrafieldcontacttype
...
Allow usage of contact extrafield element type
2015-05-29 17:18:25 +02:00
Laurent Destailleur
65c7ab7a93
Fix: Introduce error by default when function is used as a true delete
...
function.
2015-05-29 17:11:42 +02:00
Alexis Algoud
dd7febe2b9
replace test by getEntity()
2015-05-29 15:10:59 +02:00
Francis Appels
b9c3dec141
Fix: issue #2859 unit form select
2015-05-26 11:14:15 +02:00
Laurent Destailleur
c8949d0532
Some doxygen fixes
2015-05-25 18:43:46 +02:00
Raphaël Doursenaud
ec2035a73e
Allow usage of contact extrafield element type
...
As documented in the methods comments
2015-05-25 17:19:27 +02:00
phf
33ad86261a
FIX : width multiselect
2015-05-25 16:42:51 +02:00
Marcos García de La Fuente
460a2ec2ab
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/categories/categorie.php
htdocs/comm/prospect/list.php
2015-05-25 15:09:46 +02:00
Juanjo Menent
55b7dab292
Merge pull request #2884 from GPCsolutions/categories-types
...
Added types constants to categories
2015-05-23 19:09:07 +02:00
Raphaël Doursenaud
ee808cdfd7
Added types constants to categories
2015-05-23 18:52:31 +02:00
Raphaël Doursenaud
139b41c014
Make select_salesrepresentative() return 0 when empty
...
Fix #2881
2015-05-23 16:38:59 +02:00
Alexis Algoud
91885c9d6f
FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask)
2015-05-22 17:22:57 +02:00
Laurent Destailleur
390c7d8e65
Fix link to prospect with filter on commercial status
...
Enhance natural_search method to allow to search on several ids.
2015-05-22 15:19:27 +02:00
Laurent Destailleur
6f5a30638c
NEW On page to see/edit contact of an ojbect, the status of contact is
...
visible (for both external and internal users).
2015-05-22 12:21:36 +02:00
Laurent Destailleur
a09563435b
Merge pull request #2840 from FHenry/develop
...
NEW : add date value filter on account records list
2015-05-21 21:22:31 +02:00
Laurent Destailleur
e075fce5eb
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae
Enhance style
2015-05-21 01:32:56 +02:00
Florian HENRY
8fa3b8dac3
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-20 11:24:49 +02:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +02:00
Laurent Destailleur
a258370f8a
Prepare code for generic solution where all path are forged using
...
get_exdir.
2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45
Prepare to generalize usage of get_exdir
2015-05-18 21:47:44 +02:00
Florian HENRY
23eac58cc8
fix bug on new feature checkbox list form table
2015-05-18 13:13:50 +02:00
Marcos García de La Fuente
e2b2c1c8bd
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-05-15 12:30:03 +02:00
Marcos García de La Fuente
457918c0f7
Merge remote-tracking branch 'upstream/develop' into commercial-name
2015-05-15 11:17:21 +02:00
Laurent Destailleur
74607218ea
Fight against key tva_taux. Removed completely.
2015-05-14 15:59:09 +02:00
Laurent Destailleur
33b9d492e2
Clean code
2015-05-14 15:43:07 +02:00
Laurent Destailleur
ce0d728438
Merge pull request #2813 from bafbes/patch-3
...
Update html.formfile.class.php
2015-05-12 23:02:45 +02:00
Laurent Destailleur
4408648a68
Merge pull request #2817 from GPCsolutions/jqueryfixes
...
jQuery fixes
2015-05-12 22:36:12 +02:00
Raphaël Doursenaud
9b56427858
[Qual] Fixed HTML multiple attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The multiple attribute is boolean.
2015-05-12 15:11:47 +02:00
Raphaël Doursenaud
ce60ae0fcc
[Qual] Fixed HTML readonly attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The readonly attribute is boolean.
2015-05-12 15:09:26 +02:00
Raphaël Doursenaud
d5565fffc1
[Qual] Fixed HTML input form disabled attribute
2015-05-12 15:01:13 +02:00
Raphaël Doursenaud
e149d49fb8
[Qual] Use jQuery property instead of attribute to test and set disabled
2015-05-12 14:53:01 +02:00
Bahfir Abbes
142460ab16
Update html.formfile.class.php
...
Fix forgotten last contributor information
2015-05-12 08:53:09 +01:00
Bahfir Abbes
3e4fcd1ac7
Update html.formfile.class.php
...
in order to correct document lists in list of supplier invoices
2015-05-11 17:51:54 +01:00
Laurent Destailleur
5bac040a9a
Enhance prototype for select
2015-05-10 21:21:29 +02:00
Marcos García de La Fuente
ce7ed70d74
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/prospect/list.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2015-05-10 12:23:07 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731
[Qual] Fixed HTML input form disabled attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9
[Qual] Fixed HTML input form checked attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
a93ba86ce0
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/core/modules/modContrat.class.php
htdocs/expedition/class/expedition.class.php
2015-05-07 13:35:09 +02:00
Laurent Destailleur
afc487ef9d
Fix phpcs
2015-05-07 13:28:03 +02:00
Laurent Destailleur
cc5968fbd5
A more complete error message
2015-05-07 10:45:35 +02:00
Laurent Destailleur
4ce4529cd5
Revert "Remove useless variables for common object"
...
This reverts commit 82682dfc66
2015-05-05 22:09:58 +02:00
Juanjo Menent
dc01de8072
Merge pull request #2765 from aternatik/common_properties
...
Remove useless variables for common object
2015-05-05 20:27:52 +02:00
Laurent Destailleur
1e8b148e4b
Work on tracking id into emails
2015-05-05 04:10:42 +02:00
jfefe
82682dfc66
Remove useless variables for common object
...
Fields name / civility / ... are nonsense for a lot of objects into Dolibarr.
They could be defined for each object instead of into the common object class.
This for the API which exposes a property civility for a category :\
2015-05-05 01:13:49 +02:00
Laurent Destailleur
c89c89c73e
Mutualise code and some fixes for stock management.
2015-05-04 22:02:54 +02:00
Laurent Destailleur
877511717b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-05-03 21:35:09 +02:00
Laurent Destailleur
0ba2ae6d32
Some fix in css
2015-05-03 21:31:09 +02:00
Laurent Destailleur
8a7728f193
Merge pull request #2752 from fappels/develop-tcpdfbarcode
...
NEW add tcpdf barcode generator and printing, add 2d Datamatrix and QRcode CLOSE #2655
2015-05-03 21:19:01 +02:00
Laurent Destailleur
c485b1fe30
Fix When generation of doc is required and generator not provided, we
...
take first entry found.
2015-05-03 20:07:16 +02:00
Laurent Destailleur
f0b10c14d7
NEW Add a new component to select categories/tags from the main edit
...
page of product. The dedicated tab is also removed.
2015-05-03 15:51:55 +02:00
Laurent Destailleur
0479bd5a59
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/core/modules/modAdherent.class.php
2015-05-03 13:00:39 +02:00
Francis Appels
cb75d0778a
Fix doc errors
2015-05-03 11:09:33 +02:00
Francis Appels
2fd4bf1012
Add commonstickergenerator class
...
Common abstract class for sticker printing.
Creates contracts for write_file and addSticker methods
2015-05-03 09:54:37 +02:00
aspangaro
6dfd125872
Spaces 4 : Stop Shouting !
2015-05-03 06:25:50 +02:00
aspangaro
7062dc7b2e
Spaces 3 : the darkside
2015-05-03 06:20:34 +02:00
aspangaro
3a5f6db571
Spaces 2 : return of the vilains
2015-05-03 06:18:21 +02:00
aspangaro
9aa336e0d0
Spaces !!!
2015-05-03 06:16:28 +02:00
aspangaro
8163563753
New: Add option to show long or short (by default) label in select_month()
2015-05-03 06:12:02 +02:00
Francis Appels
f762d6d7cb
Add tcpdfbarcode
...
Add modTcpdfbarcode class
Add pdf_label class
pdf_standardlabel extends pdf_label
2015-04-30 16:41:52 +02:00
Laurent Destailleur
6b3c060d9c
Fix doxygen
2015-04-30 00:07:30 +02:00
Laurent Destailleur
1e237defb0
Fix phpcs
2015-04-26 17:59:02 +02:00
Laurent Destailleur
414404e854
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/core/class/commonobject.class.php
2015-04-26 16:30:33 +02:00
Laurent Destailleur
7c706ebaf6
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-25 23:15:55 +02:00
Laurent Destailleur
60a56da370
Some change into css. Tabs background are now white so main content is
...
black on white (better contrast).
Fix editfieldval for date.
2015-04-25 22:20:10 +02:00
Laurent Destailleur
5a509940f3
Merge pull request #2706 from GPCsolutions/mobiledetect
...
Mobiledetect
2015-04-24 21:22:56 +02:00
Laurent Destailleur
a091158cce
Merge pull request #2690 from open-minds/develop
...
Add sorting for extra fields values
2015-04-24 21:10:27 +02:00
Raphaël Doursenaud
7281ea21e6
Qual: moved mobiledetect external library
...
External libraries resides in the include directory
2015-04-23 20:30:33 +02:00
Laurent Destailleur
7fd2247297
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-23 13:45:02 +02:00
Laurent Destailleur
f9285d6d23
NEW Can add all user of a project as user of a task, in one step.
2015-04-23 13:44:45 +02:00
Juanjo Menent
f7ab53be8e
Fix test for es. Dumps 3.5 et 3.6
2015-04-22 23:40:43 +02:00
Juanjo Menent
1ed573f98b
Fix : #2694 Bug: Warning: Invalid argument supplied for foreach() in
...
commande.class.php on line 852
2015-04-22 23:31:24 +02:00
Laurent Destailleur
100fa1067e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
Laurent Léonard
e0cc007487
Add sorting for extra fields values
2015-04-21 20:21:24 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Laurent Destailleur
1c8e1638c7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-21 12:08:56 +02:00
Laurent Destailleur
a690276060
Fix js warnings, select2 css was not loaded.
2015-04-21 12:08:36 +02:00
Laurent Destailleur
9d1c609c4f
Merge pull request #2538 from marcosgdf/units
...
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-04-21 11:14:50 +02:00
jfefe
f2d05ce754
Add missing value for object line type (product or service)
2015-04-20 16:20:04 +02:00
Laurent Destailleur
94589b9935
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55
Uniformize feature between invoice and merging tool
2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Raphaël Doursenaud
e7a21de11d
Use minified select2 js lib
2015-04-19 12:58:47 +02:00
Marcos García de La Fuente
15b1f03a08
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/list.php
htdocs/comm/prospect/list.php
htdocs/societe/consumption.php
htdocs/societe/soc.php
2015-04-19 00:48:07 +02:00
Laurent Destailleur
5b29c87933
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/deplacement/fiche.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Marcos García de La Fuente
87f97ed545
Merge branch 'develop' into units
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/admin/product.php
htdocs/product/card.php
2015-04-18 23:38:14 +02:00
Marcos García de La Fuente
e2e6049c7f
Copyright
2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac
Merge branch 'develop' into fr-2613
...
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586
NEW: Feature request: A page to merge two thirdparties into one #2613
2015-04-18 20:41:09 +02:00
Laurent Destailleur
e1403b136c
Merge pull request #2639 from aternatik/stable_resource
...
New : mark resource module as stable
2015-04-18 18:48:24 +02:00
Maxime Kohlhaas
51522decf3
Fix : price in editkeyval function was forcing a price rounding
2015-04-18 18:33:46 +02:00
Laurent Destailleur
08dfcf3afc
Merge
2015-04-18 18:14:55 +02:00
jfefe
f2e19f2326
Fix: error when deleting resource
2015-04-18 18:07:59 +02:00
Laurent Destailleur
ca05c9a26f
Fix PHPCS
2015-04-18 18:07:36 +02:00
Florian HENRY
b7191a541c
All send email card works with model choice box
2015-04-18 17:15:36 +02:00
Florian HENRY
cc887ceff3
fix typo
2015-04-18 16:45:45 +02:00
Florian HENRY
d3592c8d58
typo
2015-04-18 13:09:35 +02:00
Florian HENRY
6391fd0c40
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-18 11:07:07 +02:00
Florian HENRY
3d8a7ee179
Start email template selector
2015-04-18 11:06:53 +02:00
Laurent Destailleur
deb62f1ffd
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/ajax.lib.php
htdocs/expedition/list.php
2015-04-18 04:18:59 +02:00
Laurent Destailleur
aab9b0ec60
Merge pull request #2620 from atm-maxime/develop_cat_multiselect
...
New : categories as multi-select on product
2015-04-18 03:53:05 +02:00
Maxime Kohlhaas
9d8036e5a7
New : categories as multi-select on product
2015-04-18 03:12:42 +02:00
Laurent Destailleur
8511f1f7ef
Fix the data-role parameter
2015-04-15 18:14:26 +02:00
Maxime Kohlhaas
4d119065a8
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2015-04-14 13:01:41 +02:00
Laurent Destailleur
75b3fd442e
Add option to allow to filter list on project creation
2015-04-14 12:32:19 +02:00
Laurent Destailleur
97cdc55839
NEW Module notification should details of emails into confirm box, not
...
only number.
2015-04-13 17:04:18 +02:00
Laurent Destailleur
ae103e34b8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
2015-04-13 13:08:46 +02:00
Laurent Destailleur
1272b03e5e
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
56a14da5d4
FIXME that are not bug are replaced with TODO
...
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
2015-04-12 04:01:28 +02:00
Laurent Destailleur
f6c2472d92
fix var not declared
2015-04-08 21:50:17 +02:00
Laurent Destailleur
c4daca2bac
Fix #1682
2015-04-08 21:34:04 +02:00
Laurent Destailleur
ca7a7a9038
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/product/stock/product.php
2015-04-08 20:43:51 +02:00
Frédéric FRANCE
85d8d06ca4
Travis fix CMailFile.class.php
2015-04-06 20:02:29 +02:00
Laurent Destailleur
493392d89f
Remove warnings
2015-04-06 19:46:10 +02:00
Laurent Destailleur
0155d75f27
Merge pull request #2554 from aspangaro/develop-adherent
...
Module member: move field note to note_private & typo
2015-04-06 12:58:52 +02:00
Laurent Destailleur
e2508287bd
Merge pull request #2537 from marcosgdf/cq
...
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-06 12:37:52 +02:00
Scrutinizer Auto-Fixer
4da737424e
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-04-06 10:25:30 +00:00
Laurent Destailleur
a5c74a7d95
Clean code
2015-04-06 11:59:58 +02:00
aspangaro
03b1db138e
Debug
2015-04-06 08:20:23 +02:00
Laurent Destailleur
5fa21f37f0
Fix trim label
2015-04-05 17:13:24 +02:00
Marcos García de La Fuente
7075ac74c4
Merge branch 'develop' into units
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/card.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobjectline.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/class/product.class.php
2015-04-03 15:45:54 +02:00
Laurent Destailleur
b01369a32e
Error management
2015-04-03 15:25:24 +02:00
Marcos García de La Fuente
6fe803cd86
Created Propal, FactureFourniseur, and Commande constants for status
2015-04-03 05:18:47 +02:00
Laurent Destailleur
d8db32a99c
NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2
...
approvals to make a supplier order approved. Activating this option
introduce a new permission to the second level approval.
2015-04-01 21:00:51 +02:00
Laurent Destailleur
8e9c1c4747
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
2015-04-01 16:33:39 +02:00
Laurent Destailleur
1bc0f6c99f
Fix: do not show end date when it is same than start date
2015-04-01 12:02:32 +02:00
Laurent Destailleur
293495467f
Fix: Bad ref used into notification message
2015-04-01 11:30:48 +02:00
Laurent Destailleur
86603b01dd
Merge pull request #2504 from marcosgdf/constants
...
Implemented constants for some object types and statuses
2015-03-30 09:25:18 +02:00
Marcos García de La Fuente
8b8171c700
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/comm/card.php
2015-03-30 03:25:57 +02:00
Marcos García de La Fuente
831177ef99
Implemented constants for Product class
2015-03-30 03:14:07 +02:00
Laurent Destailleur
b83e9ea32f
Merge branch 'loan' of https://github.com/frederic34/dolibarr into
...
frederic34-loan
Conflicts:
htdocs/compta/bank/ligne.php
2015-03-30 02:56:26 +02:00
Laurent Destailleur
fd8d09c8c0
Fix avoid warning
2015-03-29 17:53:05 +02:00
Laurent Destailleur
73b2e0bd01
Merge pull request #2471 from marcosgdf/refactor
...
refactor
2015-03-29 16:17:36 +02:00
Laurent Destailleur
21b1f7cc26
Fix bad calculation of email for notifications
2015-03-25 14:51:12 +01:00
fmarcet
456b11d148
Fix: Not using where on sellist
2015-03-25 11:23:05 +01:00
Laurent Destailleur
a32fc9efce
Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set.
...
Avoid logo to overwrap box with css.
Add help text.
2015-03-24 14:08:56 +01:00
Marcos García de La Fuente
3d50b41b8e
Reverted $rowid instead of $id property
2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299
Revert "Revert "Refactor 1""
2015-03-23 01:39:12 +01:00
Laurent Destailleur
87faf530e0
Merge pull request #2468 from defrance69/patch-55
...
Update extrafields.class.php
2015-03-22 21:28:53 +01:00
Laurent Destailleur
abcebd7875
Merge pull request #2462 from defrance69/patch-54
...
Update extrafields.class.php
2015-03-22 21:27:38 +01:00
BENKE Charles
730593b525
Update extrafields.class.php
...
if no elementtype send at the function, they return an empty array
2015-03-22 20:26:20 +01:00
Laurent Destailleur
49824a0e56
Method colorStringToArray can accept the #
...
Method monthArray can return short label of month
2015-03-22 18:17:25 +01:00
Laurent Destailleur
2d90256640
Revert "Refactor 1"
2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04
Merge pull request #2456 from marcosgdf/refactor-1
...
Refactor 1
2015-03-22 12:47:05 +01:00
Laurent Destailleur
55140afde4
Merge branch 'price-global-variables' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-price-global-variables
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/dynamic_price/editor.php
2015-03-22 12:45:04 +01:00
Laurent Destailleur
3a9c195f10
Fix hook management match spec
2015-03-20 00:34:55 +01:00
Laurent Destailleur
f44d91e153
NEW: The notification module accept keyword __SUPERVISOR__ to send
...
notification to supervisor of user.
2015-03-19 11:47:30 +01:00
Laurent Destailleur
6ceda02eaa
NEW: Enhancement of module 'Notification by Email'. Show nb of
...
notifications set. Can set several emails. Can set a threshold on
amount for notifications. Add notification on supplier order validation.
2015-03-18 21:44:57 +01:00
Laurent Destailleur
a2676e5768
Fix: the type of notification sent was not filled
2015-03-18 21:06:55 +01:00
Laurent Destailleur
ba526c5a2f
Merge remote-tracking branch 'origin/3.7' into develop
2015-03-18 14:32:58 +01:00
Laurent Destailleur
2c61717e10
Fix sql syntax error
2015-03-18 14:19:17 +01:00
BENKE Charles
d5afa1b29f
Update extrafields.class.php
...
Link object : include only if something to display
2015-03-18 13:23:14 +01:00
Laurent Destailleur
7ef11b2f38
Fix selected attribute not set correctly
2015-03-18 13:16:59 +01:00
Laurent Destailleur
84bea6166e
Doxygen
2015-03-17 10:55:45 +01:00
Laurent Destailleur
4fffeb3a89
Clean code
2015-03-17 10:52:27 +01:00
Laurent Destailleur
689d270552
Doxygen
2015-03-17 10:47:20 +01:00
Laurent Destailleur
bfd979224f
Var not declared
2015-03-17 10:38:25 +01:00
Laurent Destailleur
6d7b340cee
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/class/dolgraph.class.php
htdocs/langs/en_AU/main.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/fr_FR/other.lang
2015-03-16 18:30:30 +01:00
Marcos García de La Fuente
6ba3b900b7
PHPCS Fix
2015-03-15 23:42:11 +01:00
Marcos García de La Fuente
b822a1e3ad
Merge branch 'develop' into commercial-name
...
Conflicts:
htdocs/societe/class/societe.class.php
2015-03-15 18:20:17 +01:00
Marcos García de La Fuente
086e439543
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd
Merge branch 'develop' into refactor-1
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/includes/tcpdi/fpdf_tpl.php
2015-03-15 18:07:30 +01:00
aspangaro
d69f066735
QUAL: Traduce terms + remove <center>
2015-03-15 14:04:07 +01:00
Ion Agorria
5f9b1fa029
Changes for applying new paths
2015-03-14 16:50:02 +01:00
Laurent Destailleur
10bbf463e7
Several bug fixes from scrutinizer
2015-03-14 14:55:41 +01:00
BENKE Charles
0aa2360691
Update extrafields.class.php
...
add new extrafields type 'link'
2015-03-14 12:31:22 +01:00
BENKE Charles
df9f822a70
Update commonobject.class.php
...
new extafields type
2015-03-14 12:25:17 +01:00
Laurent Destailleur
d056abc4e1
No need to have this protected. Property can be read with method show()
...
and this method can be override.
2015-03-13 21:45:52 +01:00
Laurent Destailleur
ba2c0a2651
Clean code of hooks.
...
Extrafield index on fk_object must be unique.
2015-03-13 20:27:54 +01:00
Maxime Kohlhaas
60022ab80d
NEW : autofocus on product selection dropdown list or search field
2015-03-12 17:25:57 +01:00
Laurent Destailleur
e8e2f65ae5
Debug virtual product interface
2015-03-11 14:55:45 +01:00
Laurent Destailleur
e2e95b5f8c
phpcs
2015-03-11 03:58:57 +01:00
Laurent Destailleur
a5645b626c
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/tpl/objectline_view.tpl.php
htdocs/projet/element.php
2015-03-11 03:55:46 +01:00
Laurent Destailleur
e8732df747
Merge pull request #2441 from aspangaro/develop-ReviewER
...
FIXED: Review Expense Report
2015-03-11 02:14:13 +01:00
Laurent Destailleur
c271257452
Prepare extrafield for option by default into lists
2015-03-10 22:27:16 +01:00
Laurent Destailleur
b4a8f19696
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/class/extrafields.class.php
2015-03-10 18:37:13 +01:00
Laurent Destailleur
364b185442
Fix sql syntax
2015-03-10 18:33:14 +01:00
Laurent Destailleur
209f8946d0
All files must be lowercase
2015-03-10 14:17:58 +01:00
Laurent Destailleur
94acbeaa22
Prepare perms on extrafields
2015-03-09 21:40:24 +01:00
aspangaro
69dc3cdd61
Correct fk_statut & work en list
2015-03-08 08:21:49 +01:00
Laurent Destailleur
56b5bfd25b
NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status
...
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
2015-03-08 02:08:26 +01:00
Laurent Destailleur
6db3f1b30e
Add mdule askpricesupplier into MAIN__MODULES_FOR_EXTERNAL
2015-03-07 19:06:56 +01:00
Florian HENRY
0d801be6a1
NEW: (Dev) DolGraph allow extended class to override $_stringtoshow
2015-03-06 06:12:47 +01:00
Scrutinizer Auto-Fixer
27e99793a3
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-03-06 02:10:01 +00:00
Laurent Destailleur
049174b76f
Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/
2015-03-06 01:53:02 +01:00
Laurent Destailleur
7b7b5090c7
Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into
...
atm-ph-incoterm
Conflicts:
htdocs/comm/propal.php
htdocs/fourn/commande/card.php
htdocs/fourn/facture/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 23:03:29 +01:00
Laurent Destailleur
40adbe5a72
Merge pull request #2420 from aspangaro/develop-patch17
...
NEW: [T1848] Merge bank card & account card
2015-03-04 21:09:28 +01:00
Laurent Destailleur
96de912661
NEW: Add module "Supplier commercial proposals" to requests
...
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/tpl/document_actions_post_headers.tpl.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57
Removed $permtoedit variable
2015-03-04 11:19:45 +01:00
Marcos García de La Fuente
54b6b199c7
Documented missing properties and removed redundant documentation
...
(cherry picked from commit 6124f6a
2015-03-04 10:37:48 +01:00
Marcos García de La Fuente
e1982c54d9
Moved duplicated code to common class
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
f82df1e634
Refactorred supplier order to match with objectline templates
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
174f1cb5f7
Refactored supplier invoice line view to fit commonobjectline view
2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
4c08d34bb5
Standardized $rowid as property
2015-03-04 10:37:46 +01:00
Marcos García de La Fuente
b0e728251a
Every line has a $rowid property
2015-03-04 10:37:45 +01:00
Marcos García de La Fuente
ad72425291
Moved some variables from FactureLigne to CommonInvoiceLine
2015-03-04 10:37:43 +01:00
Laurent Destailleur
4c1d51bd39
phpcs
2015-03-04 02:28:16 +01:00
Laurent Destailleur
6f96d4cd5c
Minimum style
2015-03-04 02:18:20 +01:00
Laurent Destailleur
fddbca50b1
Start to introduce MAIN_EMAIL_ADD_TRACK_ID option to test inclusion of
...
tracking id into email.
2015-03-03 18:33:53 +01:00
aspangaro
fafebf5b2a
NEW: [T1758] Merge bank card & account card
2015-03-02 22:44:11 +01:00
Florian HENRY
d80a8bbdba
revert bug1840 to eldy solution
2015-03-02 10:13:06 +01:00
Florian HENRY
d9621a1d23
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
...
Conflicts:
htdocs/contrat/card.php
2015-03-02 10:02:54 +01:00
Laurent Destailleur
73afe1513d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/commande/card.php
htdocs/core/lib/functions.lib.php
htdocs/projet/index.php
2015-03-02 03:07:19 +01:00
Laurent Destailleur
ce8cbee5d2
Merge pull request #2399 from marcosgdf/misc
...
misc
2015-03-02 00:31:27 +01:00
Laurent Destailleur
7fc0c2b485
Merge pull request #2397 from atm-alexis/new_add_doc_on_project_linked_elements
...
New add doc on project linked elements
2015-03-02 00:19:21 +01:00
Marcos García de La Fuente
b4c84fac9d
NEW: [ task #977 ] New option to manage product unit
...
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
51fff77355
Fix: time 0 must be different than time unknown.
2015-02-28 19:02:03 +01:00
Laurent Destailleur
4d226885cb
Rewrite code for supplier order and invoice to use shared code of
...
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
2015-02-28 18:10:31 +01:00
Marcos García de La Fuente
2ba795fcbc
NEW: [ task #851 ] Add a new field: Commercial name
2015-02-28 14:30:06 +01:00
Laurent Destailleur
ef14e4e7ed
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f
Work on supplier order and customer extrafields
...
Use templates to show/edit supplier order and invoice lines
2015-02-27 18:05:12 +01:00
Laurent Destailleur
828716420b
Comment of function was not correct
2015-02-26 16:19:45 +01:00
Laurent Destailleur
4bde7e9f51
Fix: Missing error management
2015-02-26 14:25:30 +01:00
Laurent Destailleur
daabc113a5
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
README.md
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
2015-02-26 13:36:07 +01:00
Laurent Destailleur
41a74c62e2
Fix trigger to insert lines where called when inserting line but also
...
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Marcos García de La Fuente
fb959abc63
Misc PHPdoc fixes
2015-02-25 18:24:36 +01:00
Alexis Algoud
b4f3068141
NEW add PDF icon on linked element into project
2015-02-24 18:20:19 +01:00
Laurent Destailleur
562348eb34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/commande/dispatch.php
2015-02-24 15:42:28 +01:00
Laurent Destailleur
74f15680e1
Fix missing fields into import of thirdparties.
...
Fix import failed to find type of companny from source file.
Fix import date of creation has wrong check rule.
2015-02-24 15:40:50 +01:00
Laurent Destailleur
6d3834b3b9
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/index.php
htdocs/projet/class/project.class.php
test/phpunit/BankAccountTest.php
2015-02-23 14:59:24 +01:00
phf
11a0624e39
[CORE] FIX Travis phpcs (#incoterm).
2015-02-23 11:19:00 +01:00
phf
127868899d
Merge branch 'develop' into incoterm
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
2015-02-23 10:42:01 +01:00
phf
c459794999
[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).
2015-02-23 10:36:44 +01:00
Laurent Destailleur
b04682db4c
Fix Edit of extrafield on supplier invoice or order was deleteing other
...
fields.
Fix Missing escapment
Fix new field delivery date was only into edit page
2015-02-22 17:41:02 +01:00
Laurent Destailleur
2bc6ac4671
Finished new module to manage expense reports !
...
Fix export to support corectly multicompany
2015-02-22 13:16:49 +01:00
Laurent Destailleur
30a5111c68
Work on expense report module
2015-02-21 15:18:05 +01:00
Laurent Destailleur
5dffe4b440
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-02-21 12:58:14 +01:00
Laurent Destailleur
070accd1e0
Work on new module expense report
2015-02-21 12:57:17 +01:00
Laurent Destailleur
1ca4e377d5
Merge remote-tracking branch 'origin/3.6' into 3.7
2015-02-20 23:47:09 +01:00
Laurent Destailleur
41196c01e9
Add hidden option FCKEDITOR_ALLOW_ANY_CONTENT to solve bug of editor not
...
accepting all html tags from templates.
2015-02-20 15:48:54 +01:00
Marcos García de La Fuente
d46c76311c
Correction
2015-02-20 10:23:17 +01:00
Florian HENRY
4ba2a1344e
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-02-19 10:15:57 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Laurent Destailleur
316e5c2f19
Merge pull request #2358 from marcosgdf/board-refactor
...
Refactored dashboard indicator
2015-02-18 23:39:15 +01:00
Laurent Destailleur
4963555669
Merge branch 'misc' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-misc
Conflicts:
htdocs/barcode/codeinit.php
2015-02-18 22:54:02 +01:00
Laurent Destailleur
1e1543403b
New: Add option SUPPLIER_ORDER_AUTOADD_USER_CONTACT to automatically set
...
user approving as contact following supplier order.
2015-02-17 19:49:17 +01:00
Marcos García de La Fuente
fa55c60c35
Renamed WorkBoardResponse to WorkboardResponse
2015-02-16 23:52:49 +01:00
Marcos García de La Fuente
c01281a538
Renamed WorkBoardResponse::$late_url to WorkBoardResponse::$url_late
2015-02-16 23:45:52 +01:00
Laurent Destailleur
23562a01ab
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_US/stocks.lang
2015-02-16 20:59:04 +01:00
Laurent Destailleur
213c818204
Debug serial/lot management
2015-02-16 20:14:16 +01:00
Laurent Destailleur
3cf4b80baa
Fix missing test of action when using canvas
2015-02-16 02:02:11 +01:00
Laurent Destailleur
2e0b2fb012
Work on expensereport module
2015-02-15 22:49:23 +01:00
Laurent Destailleur
e5b401c8f2
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/langs/es_ES/agenda.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/suppliers.lang
2015-02-15 19:51:49 +01:00
Laurent Destailleur
eef1e17c61
Fix: default vat
2015-02-15 19:38:20 +01:00
Marcos García de La Fuente
2c074a94f3
Fix: [ bug #1790 ] Sending a test mail from admin page, gives "File already exists" error
2015-02-15 15:57:38 +01:00
Marcos García de La Fuente
d5fd20e911
Renamed BoardResponse to WorkBoardResponse
2015-02-15 15:10:51 +01:00
Marcos García de La Fuente
d1f73499e9
Refactored dashboard indicator
2015-02-15 15:01:28 +01:00
Laurent Destailleur
448655ea45
First work on a new module for expense report matching dolibarr
...
standard to replace current one.
2015-02-14 18:39:45 +01:00
Laurent Destailleur
179cbbd187
Maxi debug and enhancement of module batch.
2015-02-11 22:54:06 +01:00
Florian HENRY
e9bfa71556
syntax
2015-02-11 11:49:06 +01:00
Florian HENRY
db2dee7c03
syntax
2015-02-11 11:48:11 +01:00
Florian HENRY
db94860f76
syntax
2015-02-11 11:47:12 +01:00
Florian HENRY
73f1d10b72
syntax
2015-02-11 11:46:29 +01:00
Florian HENRY
7f5e4aa135
FIX : bug #1840 Email template modules in HTML are not render correctly
2015-02-11 11:44:49 +01:00
Laurent Destailleur
e3885d6d73
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/tax.lib.php
2015-02-10 21:36:38 +01:00
Marcos García de La Fuente
530186c59d
PHPDoc and misc fixes for several folders
2015-02-10 13:32:00 +01:00
Marcos García de La Fuente
0d6d98b395
PHPDoc and misc fixes for several folders
2015-02-10 13:17:37 +01:00
phf
2a1a5e74c6
[CORE] mise à jour de l'objet pour l'info bulle après modification de l'incoterm (#incoterm).
2015-02-10 11:46:09 +01:00
Marcos García de La Fuente
023175b9f1
PHPDoc and misc fixes for several folders
2015-02-10 11:38:13 +01:00
Marcos García de La Fuente
ca939bf8a5
PHPDoc and misc fixes for several folders
2015-02-10 11:02:11 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
Marcos García de La Fuente
157a6e109e
Misc Adherents PHPDoc corrections
2015-02-10 10:45:48 +01:00
phf
1701ecfd89
[CORE] fonction setIncoterms générique pour mettre à jour les valeurs de incotermsdes différentes tables (#incoterm).
2015-02-10 10:23:38 +01:00
phf
23751c75dc
[CORE] fin de la mise en place de la gestion incoterms des sociétés (#incoterm).
2015-02-10 10:22:38 +01:00
phf
62762f82a9
[CORE] incorporation de l'ajout / modification de l'incoterm sur un tiers (#incoterm
2015-02-09 17:55:43 +01:00
phf
34bc1dbc15
Merge branch 'develop' into new_ask_price
2015-02-09 09:07:50 +01:00
Laurent Destailleur
90fdc29d5e
Fix restore compatibility
2015-02-07 17:41:20 +01:00
Laurent Destailleur
a21acdeb7c
Enable select2 for users combo
2015-02-07 03:41:09 +01:00
Laurent Destailleur
011d39105d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/admin/export.php
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/core/datepicker.php
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
35129f2192
Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
...
supported.
Fix: No limit on ldap search on dolibarr side.
2015-02-06 16:33:33 +01:00
Laurent Destailleur
96215ccea5
Fix bad operator for and
2015-02-03 13:05:28 +01:00
phf
c22bbb23d8
[CORE] ré-indentation d'une ligne (#new_ask_price).
2015-02-03 10:09:25 +01:00
Laurent Destailleur
7b209fa0be
New: Add hidden option PDF_SHOW_PROJECT to show project ref onto
...
supplier orders and invoices.
2015-02-02 18:36:49 +01:00
phf
5266542bc9
[CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price).
2015-02-02 17:50:33 +01:00
Laurent Destailleur
9c087e27d0
Fix permissions
2015-02-02 13:45:55 +01:00
Laurent Destailleur
34cbcad9da
Reduce number of new to save memory usage.
...
Fight table to replace with div
2015-02-01 00:40:42 +01:00
Laurent Destailleur
9188be57ce
Select2 component creates problem of sizing with jmobile.
2015-01-31 19:25:26 +01:00
Laurent Destailleur
d66d4f53a5
Merge branch 'tooltip' of https://github.com/frederic34/dolibarr into
...
frederic34-tooltip
Conflicts:
htdocs/core/boxes/box_produits.php
htdocs/core/boxes/box_produits_alerte_stock.php
htdocs/product/index.php
2015-01-31 15:41:33 +01:00
Laurent Destailleur
1c7feb67ea
Merge branch 'dinamic-prices-product' of
...
https://github.com/IonAgorria/dolibarr into
IonAgorria-dinamic-prices-product
Conflicts:
htdocs/install/mysql/migration/3.7.0-3.8.0.sql
htdocs/product/fournisseurs.php
2015-01-31 14:53:14 +01:00
frederic34
6a1865adb6
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/fourn/commande/list.php
2015-01-31 09:58:41 +01:00
Laurent Destailleur
275e198041
New: Selection of project use the new select2 component.
2015-01-30 19:57:38 +01:00
frederic34
b850b7b448
Merge remote branch 'upstream/develop' into tooltip
...
Conflicts:
htdocs/langs/en_US/sendings.lang
2015-01-30 16:45:24 +01:00
frederic34
736bee565c
Tooltip everywhere
2015-01-30 16:40:33 +01:00
Laurent Destailleur
59711298c3
Fixed: Length of project label is no more truncated on element cards
...
(invoice, proposal, order...)
2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
2015-01-30 15:53:06 +01:00
Laurent Destailleur
ad6af14edd
Fixed: Status was not visible if selected.
2015-01-28 19:27:56 +01:00
phf
5da4d0262e
[CORE] ajouts des conditions nécessaire pour l'intégration du module (#new_ask_price).
2015-01-28 17:28:44 +01:00
phf
a9d26efee8
[CORE] ajout des conditions pour un element de type askpricesupplier (#new_ask_price).
2015-01-28 14:44:48 +01:00
phf
ec621244f3
[CORE] ajouts des conditions spécifiques pour les appels depuis l'objet AskPriceSupplier (#new_ask_price).
2015-01-28 14:34:27 +01:00
phf
49fa0056c8
[CORE] Avancement des replace (#new_ask_price).
2015-01-27 17:43:07 +01:00
Laurent Destailleur
6bda61436b
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions2.lib.php
htdocs/projet/element.php
2015-01-22 21:52:55 +01:00
frederic34
12c8d4ba1f
Merge remote branch 'upstream/develop' into tooltip
2015-01-22 00:44:50 +01:00
frederic34
f4161b457b
Add dol_escape_htmltag and start to adapt boxes
2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3
Add tooltip in getNomUrl link
2015-01-20 21:40:33 +01:00
Frédéric FRANCE
3ab6ac601e
Type of supplier invoice was broken
2015-01-20 17:55:20 +01:00
Laurent Destailleur
e14684c417
Merge pull request #2259 from marcosgdf/misc-fixes
...
misc-fixes
2015-01-19 15:28:28 +01:00
Florian HENRY
ab50437331
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/html.form.class.php
2015-01-19 09:38:00 +01:00
Laurent Destailleur
e220ce5a82
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
ChangeLog
htdocs/adherents/fiche.php
htdocs/comm/fiche.php
htdocs/comm/mailing/fiche.php
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/paiement.php
htdocs/core/class/html.formcompany.class.php
htdocs/core/tpl/login.tpl.php
htdocs/expedition/fiche.php
htdocs/fourn/commande/fiche.php
htdocs/fourn/facture/fiche.php
htdocs/fourn/facture/paiement.php
htdocs/fourn/fiche.php
htdocs/main.inc.php
htdocs/product/fournisseurs.php
htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
55b8c28100
Corrected weird typo
2015-01-18 16:28:42 +01:00
Florian HENRY
b171975d18
Fix travis
2015-01-18 16:08:10 +01:00
Florian HENRY
22c253cfc1
add extrafield type, check box from table
2015-01-18 16:02:31 +01:00
Laurent Destailleur
d1e2ab6f56
Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into
...
marcosgdf-bug-1783
Conflicts:
ChangeLog
2015-01-18 15:10:30 +01:00
Laurent Destailleur
3db231cea6
Merge pull request #2232 from defrance69/patch-43
...
Update commondocgenerator.class.php
2015-01-18 13:45:50 +01:00
Laurent Destailleur
34fe87536b
Merge pull request #2137 from frederic34/printipp
...
Printing System which may accept modules
2015-01-18 13:09:41 +01:00
Frédéric FRANCE
f3a3136452
Update html.form.class.php
2015-01-18 11:38:45 +01:00
Marcos García de La Fuente
dacec491ff
Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON
2015-01-17 19:37:49 +01:00
Laurent Destailleur
1664b89cef
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-01-17 19:26:19 +01:00
Marcos García de La Fuente
068045f6a0
Fix: [ bug #1803 ] AJAX company contact input is not aligned
2015-01-17 18:23:20 +01:00
Laurent Destailleur
007f18bcf7
Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into
...
GPCsolutions-review
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/cashjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/comm/action/peruser.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/accounting.lib.php
htdocs/core/lib/report.lib.php
2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9
Merge pull request #2020 from GPCsolutions/situationsinvoices
...
Situations invoices support
2015-01-17 14:44:05 +01:00
Laurent Destailleur
8cd46e4830
Introduce option MAIN_HTML_TITLE to start to control format of html
...
title content.
2015-01-17 14:34:16 +01:00
BENKE Charles
e07bb07bab
Update commondocgenerator.class.php
...
add extrafield on odt lines
2015-01-12 18:18:43 +01:00
Laurent Destailleur
fc78d632d3
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/contrat/class/contrat.class.php
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2015-01-09 23:09:10 +01:00
frederic34
60661ae948
Add some "classfortooltip"
2015-01-09 00:07:54 +01:00
Raphaël Doursenaud
50c2b75ef8
Invoices: added situation (or interim) invoices support
2015-01-06 17:12:13 +01:00
Laurent Destailleur
443c9d245e
Merge pull request #2212 from marcosgdf/misc-doc
...
Miscellaneous corrections
2015-01-06 00:21:05 +01:00
Laurent Destailleur
ce1cad2801
Merge pull request #2207 from frederic34/patch-3
...
Enhance select_categories with select2
2015-01-06 00:17:43 +01:00
Laurent Destailleur
6916fffbe2
Merge pull request #2197 from frederic34/patch-5
...
Attribut width not allowed with div or span
2015-01-06 00:08:08 +01:00
philippe grand
96e6c66365
better translation and typo
2015-01-01 11:24:00 +01:00
Marcos García de La Fuente
86100758ff
Miscellaneous corrections
2014-12-28 20:13:15 +01:00
Marcos García de La Fuente
ef4d710f78
Improving CommonObject and Contrat documentation
2014-12-28 19:16:14 +01:00
Frédéric FRANCE
56dd276504
Enhance search_categories with select2
2014-12-28 15:17:54 +01:00
frederic34
e937039596
Merge remote branch 'upstream/develop' into printipp
2014-12-28 11:59:58 +01:00
Ion Agorria
5bbcb58b44
Added expressions for product/service prices
2014-12-28 01:26:41 +01:00
Frédéric FRANCE
dc18759c6c
Attribut width not allowed with div or span
2014-12-27 11:15:26 +01:00
Laurent Destailleur
5d80061caf
Mark property error as deprecated
2014-12-26 22:04:16 +01:00
Laurent Destailleur
d8557d8af0
Fixed: label
2014-12-26 05:16:00 +01:00
Laurent Destailleur
5ead994955
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-26 04:57:55 +01:00
Laurent Destailleur
3c500158a9
Merge pull request #2187 from marcosgdf/bug-1715
...
Fix [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-26 04:02:46 +01:00
Laurent Destailleur
5215b1e641
Merge pull request #2186 from marcosgdf/bug-575
...
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
2014-12-26 04:02:01 +01:00
Laurent Destailleur
54437703fb
Merge pull request #2177 from frederic34/patch-7
...
Enhance select_salesrepresentatives with select2
2014-12-26 03:49:43 +01:00
Marcos García de La Fuente
2616deb58d
Copyright info
2014-12-25 22:52:11 +01:00
Marcos García de La Fuente
eb524cfd29
Copyright info
2014-12-25 22:50:33 +01:00
Marcos García de La Fuente
7b6a4d1bfd
Fix: [ bug #1715 ] Valign and width attributes are used in div tags
2014-12-25 22:50:15 +01:00
Marcos García de La Fuente
1f00794c98
Fixed bug which didn't show documents in auto GED when an object had '/' in its ref
2014-12-25 21:47:39 +01:00
Laurent Destailleur
bd7f6339ce
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-25 12:08:35 +01:00
Marcos García de La Fuente
1179f722af
Merge branch '3.7' into bug-1533
2014-12-25 01:26:00 +01:00
Frédéric FRANCE
d03cc03cd7
Enhance select_salesrepresentatives with select2
2014-12-23 16:42:05 +01:00
Laurent Destailleur
acf7b9f130
Because this is a legal issue (OPCA), i added the hidden constant for
...
3.7: WORKFLOW_PROPAL_CAN_CLASSIFY_BILLED_WITHOUT_INVOICES => Button
"Classified Billed" is visible on proposal even if there is no invoice
linked to proposal.
Fixed: Also fix get list of invoice that report too many data.
2014-12-23 12:59:34 +01:00
Marcos García de La Fuente
8a14409974
Fix: [ bug #1533 ] Links triggers do not show trigger error message
2014-12-23 11:39:43 +01:00
Laurent Destailleur
2a3bb96c34
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ecm.lib.php
2014-12-22 03:14:22 +01:00
frederic34
3bf63ed0a9
Merge remote branch 'upstream/develop' into printipp
2014-12-21 14:59:37 +01:00
Laurent Destailleur
31f782ffe9
Fix: Several fixes into tasks and time spent management
2014-12-21 14:58:18 +01:00
Laurent Destailleur
22c27e8703
PHPCS
2014-12-21 02:21:12 +01:00
Laurent Destailleur
268723be7b
Fixed: sql syntax error
2014-12-21 01:39:20 +01:00
Laurent Destailleur
cea500ef80
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/core/lib/ajax.lib.php
2014-12-20 13:06:08 +01:00
Laurent Destailleur
c9f3267649
Fixed: bad conditions
2014-12-20 11:34:37 +01:00
Laurent Destailleur
27f26bba27
Fixed: Missing test
2014-12-20 11:17:04 +01:00
Laurent Destailleur
854ed90a62
Fixed: bad place for the ajaxcombo.
2014-12-20 11:15:10 +01:00
Laurent Destailleur
4769e26d8e
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
ChangeLog
2014-12-18 12:34:41 +01:00
Laurent Destailleur
ef5035b349
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/liste.php
2014-12-18 11:42:55 +01:00
Laurent Destailleur
2c01a46774
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
htdocs/paypal/lib/paypal.lib.php
2014-12-18 10:13:25 +01:00
Laurent Destailleur
f5da9b5e33
Merge pull request #2149 from altatof/3.5
...
FIX: dont put a mess with date and datetime extrafield value if already in right format
2014-12-18 10:04:03 +01:00
Laurent Destailleur
6728ad3c37
Merge pull request #2148 from altatof/fixhook
...
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
2014-12-18 10:03:32 +01:00
Laurent Destailleur
a8c6417604
Merge remote-tracking branch 'origin/3.7' into develop
2014-12-15 10:33:14 +01:00
Laurent Destailleur
0b6ff8f9bc
Fix: Debug of feature PRODUIT_CUSTOMER_PRICES_BY_QTY. Dev seems to not
...
be finished. We keep it as development status.
2014-12-14 20:41:11 +01:00
Laurent Destailleur
711b033844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/html.form.class.php
htdocs/product/stock/card.php
2014-12-14 12:35:13 +01:00
Christophe Battarel
27b47a4f48
FIX: dont put a mess with date and datetime extrafield value if already
...
in right format (the bug was in propale/order/invoice extrafields,
mainly visible with 2 datetime extrafields)
2014-12-12 14:31:36 +01:00
Christophe Battarel
a1bba472a0
FIX: hook insertExtraFields must return a returnvalue (0,1,-1)
2014-12-12 11:57:20 +01:00
Laurent Destailleur
c994fbe44d
Fixed: Bad style
2014-12-11 14:31:47 +01:00
Laurent Destailleur
b7c476d339
Merge pull request #2139 from frederic34/patch-3
...
Use same size for select_produits_fournisseur and select_produits
2014-12-10 11:30:57 +01:00
Laurent Destailleur
7834a9b099
Add hidden constant to solve bug of too low size to see products label.
2014-12-10 00:51:57 +01:00
Frédéric FRANCE
9f1ec0e710
Update html.form.class.php
2014-12-09 20:52:55 +01:00
Frédéric FRANCE
6a01b6982e
Update html.form.class.php
2014-12-09 20:20:52 +01:00
Frédéric FRANCE
34b42ba798
Truncate label different for small or big screen
2014-12-09 18:47:12 +01:00
Frédéric FRANCE
8cae2f1448
Use same size for select_produits_fournisseur and select_produits
2014-12-09 16:21:44 +01:00
aspangaro
81dc1415de
Untranslatable token in activity box
2014-12-09 05:04:39 +01:00
frederic34
16d860b3f7
Lang Correction
2014-12-08 22:17:28 +01:00
frederic34
295fe115ab
Merge remote branch 'upstream/develop' into printipp
2014-12-08 20:33:50 +01:00
frederic34
be60c13de6
WIP Printing System
2014-12-08 20:33:26 +01:00
Laurent Destailleur
a8052d8ea4
Fixed: Several fix in color management (function at wrong place, mark
...
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:12:27 +01:00
Laurent Destailleur
0ea7d51b22
Fixed: Several fix in color management (function at wrong place, mark
...
param that are deprecated, convertion of value to get correct
format in all situation)
2014-12-08 19:05:22 +01:00
Laurent Destailleur
6ddae270b9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 23:52:02 +01:00
Laurent Destailleur
634a9d8402
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/core/lib/functions.lib.php
2014-12-07 19:19:48 +01:00
Laurent Destailleur
c35018be5f
Fixed: Translations
2014-12-07 18:24:45 +01:00
Laurent Destailleur
0b766b1f47
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-12-07 12:11:26 +01:00
Laurent Destailleur
ff23b0c0a6
Fix: No print
2014-12-07 12:10:50 +01:00
Laurent Destailleur
3186a8c23f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-07 12:07:53 +01:00
Florian HENRY
aaf2cca45f
Fix bug n sellist extrafield filtered
2014-12-05 21:25:43 +01:00
Laurent Destailleur
344aa40858
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
dev/codesniffer/ruleset.xml
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 20:21:40 +01:00
Laurent Destailleur
5f353c39d1
Fix: PHPCS
2014-12-05 20:18:30 +01:00
frederic34
5cce8c45e3
WIP PrintIPP
2014-12-05 18:23:54 +01:00
Laurent Destailleur
a9338a0f9f
Fix: Maxi debug of module productbatch.
...
Conflicts:
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a
Fix: Maxi debug of module productbatch.
2014-12-05 16:01:01 +01:00
Laurent Destailleur
ceba894d57
Start to work on new generation combo box.
2014-12-05 13:26:47 +01:00
Laurent Destailleur
bff65fc6b4
Fix: starting with var with always same color
2014-12-05 01:25:18 +01:00
Laurent Destailleur
6729544782
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/projet/tasks/task.php
2014-12-04 14:52:34 +01:00
Laurent Destailleur
83122ebe1e
Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now
...
for release.
2014-12-04 13:20:56 +01:00
Laurent Destailleur
860d0b0820
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-12-04 11:29:10 +01:00
Laurent Destailleur
5dbfaec9f8
Enable option PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS by default
2014-12-04 11:18:40 +01:00
Laurent Destailleur
b5d74372de
Bad var
2014-12-04 01:36:53 +01:00
Laurent Destailleur
1e8e4e7fda
Prepare 3.8 dev
...
Fix bad test.
Renamed table for dynamic prices.
2014-12-03 17:06:44 +01:00
Laurent Destailleur
1653384415
Merge branch 'dinamic-prices' of github.com:IonAgorria/dolibarr into IonAgorria-dinamic-prices
2014-12-03 13:14:35 +01:00
Laurent Destailleur
f884f16564
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/boxes.php
htdocs/comm/action/card.php
htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Laurent Destailleur
3a476d0daf
Merge pull request #2123 from frederic34/patch-12
...
Update card.php
2014-12-03 12:20:00 +01:00
Laurent Destailleur
f3584fa211
Fixed: Button at wrong place
...
Fixed: Must use style css span badge for number of files
2014-12-01 00:53:15 +01:00
Frédéric FRANCE
a3d843f698
Update commonobject.class.php
2014-11-30 22:06:58 +01:00
Frédéric FRANCE
dd18c980fc
Update html.form.class.php
2014-11-30 22:00:16 +01:00
Laurent Destailleur
01209ff844
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Laurent Destailleur
20e76aa4e6
Fixed: Use constant to hide a feature that will probably be broken. Also
...
it is a superfluous feature.
2014-11-30 02:05:45 +01:00
Laurent Destailleur
278cdf72d6
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2014-11-29 12:41:26 +01:00
Laurent Destailleur
e118d9af22
Fixed: Protection to lock language setup in demo mode was not working
2014-11-29 12:11:12 +01:00
Ion Agorria
fac46b3b46
Code for dinamic prices funcionality
2014-11-29 06:31:35 +01:00
Laurent Destailleur
a724c3aa70
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
6843bfcc15
Fix typo
2014-11-28 00:01:59 +01:00
Laurent Destailleur
d9cb9c1585
Merge pull request #2102 from aspangaro/develop-center
...
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
Laurent Destailleur
60e5369db2
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/bookmarks/card.php
2014-11-27 22:01:02 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
Laurent Destailleur
7a18240d2f
Doxygen
2014-11-23 23:22:49 +01:00
Laurent Destailleur
2a56a19b7d
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-22 16:59:12 +01:00
Laurent Destailleur
671243e8f6
Fixed: Bugs reported by scrutinizer
...
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
02e18bc03d
Merge remote-tracking branch 'origin/3.7' into develop
2014-11-22 16:29:06 +01:00
Laurent Destailleur
8b545af325
Merge pull request #1982 from atm-alexis/feature_agenda_files_on_card_view
...
add files view into agenda card
2014-11-22 16:24:09 +01:00
Laurent Destailleur
d8767bfbae
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-22 16:03:09 +01:00
Laurent Destailleur
2f4de2ef75
Merge pull request #2016 from altatof/3.5
...
FIX: copy extrafields when creating order from propale and creating
2014-11-22 16:02:13 +01:00
BENKE Charles
730bf1c25c
Update html.formcontract.class.php
...
bad filtering on contract list (same sql rule as project)
2014-11-22 15:41:18 +01:00
Laurent Destailleur
f845cde3f1
Merge pull request #2056 from defrance69/patch-29
...
bad filtering on contract list (same sql rule as project)
2014-11-22 15:40:41 +01:00
Laurent Destailleur
b644075faa
Fix: doxygen
2014-11-20 23:41:58 +01:00
Laurent Destailleur
f7a74a9ac9
Fix: CRLF
2014-11-20 16:16:15 +01:00
Laurent Destailleur
95de38e102
Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les
...
autres module pour affectation but it is a too important change.
2014-11-20 15:32:10 +01:00
Laurent Destailleur
d462facf6d
Fixed: [ bug #1653 ] Can't access task notes
2014-11-20 14:44:49 +01:00
Laurent Destailleur
ea02bdf85e
Fix: duplicate function
2014-11-20 13:06:05 +01:00
Juanjo Menent
9e28452379
Fix: remove duplicate code
2014-11-19 10:02:01 +01:00
Juanjo Menent
3dacdf4e4a
Fix: Conflicts and remove duplicate code
2014-11-19 09:41:21 +01:00
BENKE Charles
44f3e64df2
Update html.formcontract.class.php
...
bad filtering on contract list (same sql rule as project)
2014-11-19 09:28:11 +01:00
Laurent Destailleur
31f987706c
Fix: bugs reported by scrutinizer
2014-11-17 15:13:23 +01:00
Laurent Destailleur
f4a63b498b
Fix: bugs reported by scrutinizer
2014-11-17 15:09:52 +01:00
Christophe Battarel
d0dc792b3c
check extrafields before inserting in DB
2014-11-17 11:17:45 +01:00
Laurent Destailleur
e3a8041b0d
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/facture.php
htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Laurent Destailleur
64a2cce7c0
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-11-16 14:11:19 +01:00
Laurent Destailleur
d4ad7236e5
Clean old code for multiselect (replaced with select2 plugin).
2014-11-16 00:46:27 +01:00
Laurent Destailleur
445f696d28
Fix: Pb of object with wrong type.
2014-11-15 18:24:38 +01:00
Laurent Destailleur
ad661256c0
Fix: Bugs reported by scrutinizer
2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d
Fix: Bugs reported by scrutinizer
2014-11-15 15:19:37 +01:00
Laurent Destailleur
2aeb0f4f5b
Merge pull request #1941 from jfefe/patch-3
...
Avoid missing class error for fetch_thirdparty method
2014-11-15 12:36:41 +01:00
Laurent Destailleur
a46a6cccaf
Fix: Screen page tests. Page tests are now ok with 3.7.
2014-11-15 00:57:31 +01:00
Laurent Destailleur
6bac744709
Fix: Missing event management into select when combo not selected
2014-11-13 16:46:40 +01:00
Laurent Destailleur
608fa5eaed
Fix: Avoid to load language when we can not.
2014-11-12 10:25:56 +01:00
Laurent Destailleur
47ebe21f7b
Fix: Removed unused property
2014-11-11 23:38:56 +01:00
Laurent Destailleur
1dcca6e553
Avoid error
2014-11-08 00:49:52 +01:00
Laurent Destailleur
9e92b469b9
Merge pull request #2005 from altairis-fr/hidemargininfos
...
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-07 21:47:06 +01:00
Juanjo Menent
6f9d283ddc
Fix: Module notifications DB Error "unknown field type" into third tab
...
notifications
2014-11-06 11:20:47 +01:00
Christophe Battarel
44882f4035
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/adherents/fiche.php
htdocs/core/lib/date.lib.php
htdocs/langs/fr_FR/bills.lang
htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
ChangeLog
htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
5c2862dae3
Merge pull request #1976 from frederic34/patch-2
...
Add a little delay in ajax_autocompleter
2014-11-04 17:41:23 +01:00
Laurent Destailleur
420de76b4b
Merge pull request #1993 from aspangaro/3.6-patch
...
GPLv3
2014-11-04 17:40:38 +01:00
Laurent Destailleur
0b41df7c35
Clean code to manage multiselect jquery: All code is centralized
...
into function multipleselectarray (except loading of css).
Code is prepared to choose which plugin to use (only a if is required
to switch or add a new manager). Introduce working version with
multiple-select jquery plugin. Removed deprecated old jquery plugin.
2014-11-04 00:33:50 +01:00
Laurent Destailleur
b6b6cced30
Fix: Test sur user assigned not filled
...
Can use empty line into select boolean form.
2014-11-03 20:02:11 +01:00
Laurent Destailleur
cf6a0df3e4
A lot of fix in missing intervention trigger. Align key to use same name
...
to avoid future bugs.
2014-11-03 17:23:02 +01:00
Laurent Destailleur
5086450f35
Fix: Forging email content must use dol_concatdesc.
2014-11-02 12:32:38 +01:00
Laurent Destailleur
53dfda1413
Fix: Chars - is no more allowed into value for code for extra fields.
2014-11-01 19:34:20 +01:00
Laurent Destailleur
9c51effe5c
Ajout plus d'info dans description audit.
2014-10-31 15:42:35 +01:00
aspangaro
57f49ec5d4
GPLv3
2014-10-30 20:41:08 +01:00
Frédéric FRANCE
f18e513046
Update html.form.class.php
2014-10-30 18:44:56 +01:00
Laurent Destailleur
82812aa679
Merge pull request #1970 from FHenry/develop
...
Add hook method to simply display child lines in order/invoice/propal
2014-10-30 18:11:41 +01:00
Laurent Destailleur
3e12239f11
Merge pull request #1971 from defrance69/patch-25
...
Update commondocgenerator.class.php
2014-10-30 18:10:52 +01:00
Laurent Destailleur
9d9a1e0701
Merge pull request #1974 from grandoc/develop
...
encrease name length for societe
2014-10-30 18:04:38 +01:00
Laurent Destailleur
750944d718
Fix: var not initialised
2014-10-30 11:16:01 +01:00
Laurent Destailleur
a0c9af2385
New: Can filter on date into tab "Referring object" of a project.
2014-10-29 20:21:24 +01:00
Laurent Destailleur
0abeea059e
Uniformize and clean boxes behaviour and translation.
2014-10-27 21:48:28 +01:00
Florian HENRY
d846dd2431
Fix extrafield from list feature where filter is provided
2014-10-27 19:38:27 +01:00
Alexis Algoud
eebf107d5f
includes and show_documents
2014-10-27 10:54:50 +01:00
Laurent Destailleur
a1a03a8061
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 01:20:59 +02:00
Laurent Destailleur
0fc1c85b34
New: Module notification has been enhanced:
...
EMail use now language of target contact.
Can also define a fixed email for notifications.
Better error management
2014-10-25 00:42:52 +02:00
Philippe GRAND
463904706b
better display margin infos
2014-10-23 15:02:49 +02:00
BENKE Charles
10f419e372
error on adding fields (bad function
2014-10-23 13:08:39 +02:00
jfefe
29db45c763
Avoid missing class error for fetch_thirdparty method
2014-10-23 01:15:05 +02:00
BENKE Charles
c103a5927a
Update commondocgenerator.class.php
...
add : outstanding limit on ODT
fix : only public note are display on ODT (private stay private)
2014-10-20 22:28:08 +02:00
Florian HENRY
1eba744e8b
Add hook method to simply display child lines in order/invoice/propal
2014-10-20 13:15:48 +02:00
Laurent Destailleur
4df9fb38fb
Add option AGENDA_ALWAYS_HIDE_AUTO
2014-10-20 12:29:35 +02:00
Laurent Destailleur
0fba70d4d1
Fix: Triggers sending email for intervention and classify billed
2014-10-20 11:35:34 +02:00
Laurent Destailleur
3fe4c58e95
Use span class="badge" for notes.
2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b
Fix: Better layout detection
2014-10-19 12:24:36 +02:00
Laurent Destailleur
13590a876b
Fix: A little clean of dol_hash usage.
2014-10-18 16:08:15 +02:00
Laurent Destailleur
873f8a6f27
If there is at least one favorite into countries, then add a separator
...
into list to show limit between sorted entries and not sorted entries.
2014-10-18 15:53:42 +02:00
Laurent Destailleur
e53c328767
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
ChangeLog
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:45:44 +02:00
Laurent Destailleur
ad0f842b60
Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into
...
atm-maxime-mkoevols
Conflicts:
htdocs/commande/card.php
2014-10-18 15:38:49 +02:00
aspangaro
9f6a460d42
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
...
Resolve conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:32:50 +02:00
Laurent Destailleur
b43d96f86c
New: Add id into select_category method.
2014-10-18 02:12:10 +02:00
Laurent Destailleur
58b15fa736
Fix: Solve some regressions
2014-10-18 01:32:38 +02:00
Laurent Destailleur
a2d23fd699
Fix: Error management of hook was duplicating errors.
2014-10-18 00:33:30 +02:00
Laurent Destailleur
8581e953f9
Doxygen
2014-10-17 14:45:12 +02:00
Laurent Destailleur
7a68d9a940
Miscellaneous fixes
2014-10-16 20:55:13 +02:00
Maxime Kohlhaas
8e3a3500c2
Add comments (for travis' sake)
2014-10-16 13:28:39 +02:00
Laurent Destailleur
c8dd0383d8
New: Function getCurrencyAmount is marked as deprecated. Use function
...
price to output a price including currency symbol.
2014-10-16 01:26:44 +02:00
Maxime Kohlhaas
452636b0e4
New : Add option to allow extrafield to be modified regardless of the document status
2014-10-14 15:27:40 +02:00
aspangaro
861583bb77
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-14 06:12:46 +02:00
Laurent Destailleur
2cf21f856c
Fix: table name differs.
2014-10-14 01:47:31 +02:00
Laurent Destailleur
536b579b35
Clean code
2014-10-14 00:27:23 +02:00
Laurent Destailleur
e101bfceea
Use language to find template email.
2014-10-12 21:24:51 +02:00
aspangaro
dc6817813e
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-12 20:23:08 +02:00
Regis Houssin
104592b349
Fix: wrong function name
2014-10-12 19:08:34 +02:00
Laurent Destailleur
8df8fb2fe0
Qual: Removed a lot of duplicate code
...
New: extrafields for projects and tasks are exported to ODT documents.
2014-10-12 16:19:00 +02:00
aspangaro
dad9a54959
Merge remote-tracking branch 'Upstream/develop' into develop-favorite
2014-10-12 15:47:29 +02:00
aspangaro
71dafac03c
Add favorite button into country dictionary to put value on top select list
2014-10-12 15:28:01 +02:00
Laurent Destailleur
f08759a17e
Fix: area to generate doc must use half size not onethird.
...
Fix: Missing maxwidthonsmartphone.
Fix: Missing backtopage
Fix: Missing translation key
2014-10-12 11:59:52 +02:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
2b479aa0b4
Qual: Uniformize translated label of progress on all pages.
...
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
2014-10-12 01:04:34 +02:00
Laurent Destailleur
2800faffa8
Fix: File names must be in lowercase.
...
Fix: Missing includes.
2014-10-11 18:27:30 +02:00
jfefe
6a4468d94e
Not need to test if class exists with require_once
2014-10-06 14:18:28 +02:00
jfefe
87fc27c7e6
Avoid missing class error for fetch_thirdparty method
2014-10-06 13:31:01 +02:00
Laurent Destailleur
bb852592e6
Fix: Restore broken feature. One hook = One call of function per module.
2014-10-05 04:49:46 +02:00
Laurent Destailleur
5c5f725a34
Fix scrutinizer
2014-10-05 01:22:17 +02:00
Laurent Destailleur
97eec37f1c
Uniformize code: property "nom" for thirdparty is aliased into "name"
...
everywhere.
2014-10-04 17:20:17 +02:00
Laurent Destailleur
e7a9447d94
Add hook formatEvent and fix bug into per user view.
2014-10-03 15:58:08 +02:00
Laurent Destailleur
c69565fd69
Fix: column name should not be an numeric
2014-10-03 03:12:39 +02:00
Regis Houssin
3d82f0965e
Fix: Try to filter by context, use the test with $currentcontext in
...
method for avoid to run twice (I have not found any other solution!)
2014-09-29 15:20:54 +02:00
Regis Houssin
334cdf7dca
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-29 14:41:17 +02:00
Regis Houssin
c5a7dfbabb
Fix: Add current context for avoid method execution in bad context, you
...
can add this test in your method : eg if($currentcontext != 'formfile')
return;
2014-09-29 14:40:02 +02:00
Laurent Destailleur
e0aa140960
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-29 14:01:40 +02:00
Laurent Destailleur
8ccb581185
Fix: Change for php 5.6
...
New: Management of color into type of events dictionnary (visible into
peruser view).
New: Can disable predefined type of events.
2014-09-29 13:21:03 +02:00
Regis Houssin
f233d4f610
New: add doc models management in contract module
2014-09-28 20:39:02 +02:00
Regis Houssin
f527602753
Fix: use specific css style instead, this causes a shift problem
2014-09-28 13:12:51 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
5fdd798e91
Fix: phpcheckstyle from phpcs 1.5.5 (closing tags and & char on
...
parameter).
2014-09-27 17:13:15 +02:00
Laurent Destailleur
e8b7c9c6bd
Fix: doxygen
2014-09-27 16:00:11 +02:00
Laurent Destailleur
8e95f2e223
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-09-26 12:42:41 +02:00
Laurent Destailleur
bf4b99fa64
Assignation of event to several users is on a very good way for 3.7
2014-09-26 12:27:18 +02:00
Regis Houssin
3ab8b6f7d1
New: add possibility to define a custom error message
2014-09-26 09:44:21 +02:00
Laurent Destailleur
74cba062b4
Add a TODO to explain why we keep some extends into class.
...
Should be removed once php min will be 5.4.
2014-09-23 19:37:59 +02:00
Laurent Destailleur
dd86453020
Add field color into table of type of events
2014-09-23 17:54:03 +02:00
Laurent Destailleur
7224f64224
Work on multi user for events.
...
Fix: Modules must be reloaded after migration.
2014-09-23 16:15:15 +02:00
Laurent Destailleur
65a486a48b
Merge pull request #1897 from Cubexed/develop-patch-2
...
Closed projects are greyed out in project selector
2014-09-23 00:08:46 +02:00
Laurent Destailleur
dc96e10215
Merge branch 'oop-pdf' of github.com:marcosgdf/dolibarr into
...
marcosgdf-oop-pdf
Conflicts:
htdocs/projet/class/project.class.php
2014-09-23 00:02:19 +02:00
Laurent Destailleur
08d4195504
Merge branch 'develop' of github.com:aspangaro/dolibarr into
...
aspangaro-develop
Conflicts:
htdocs/fichinter/card.php
2014-09-22 23:34:56 +02:00
Laurent Destailleur
f7f0059767
Missing hook to add button on intervention
...
Prepare to move location into resource
Can select which king of contact show into contact tab.
2014-09-22 20:16:58 +02:00
Marcos García de La Fuente
8f492a6677
Documented commonObject::commonGenerateDocument
2014-09-22 00:18:36 +02:00
aspangaro
e147259e95
Renamed all constants COMPTA_* into ACCOUNTING_* and migration of module ACCOUNTINGEX 3.6
2014-09-21 20:30:55 +02:00
Marcos García de La Fuente
bf7f4c1cab
Refactored generateDocument functions
2014-09-21 18:16:14 +02:00
aspangaro
1592968709
Merge remote-tracking branch 'Upstream/develop' into develop
2014-09-20 06:42:31 +02:00
Laurent Destailleur
cf7973d0fa
Doxygen
2014-09-20 01:26:53 +02:00
Laurent Destailleur
ad8b92541d
Fix: sql request with pgsql
...
Fix: bug reported by scrutinizer
Doxygen
Start to work on multi user assigned to an event.
2014-09-20 00:57:29 +02:00
Laurent Destailleur
ee4d697172
Fix several bugs reported by scrutinizer
2014-09-19 14:57:31 +02:00
Raphaël Doursenaud
eea9a76589
FIX: Variable might not be traversable
2014-09-19 03:07:52 +02:00
Raphaël Doursenaud
3a0d4cd47f
FIX: Missing visibility of static property
2014-09-19 03:05:21 +02:00
Raphaël Doursenaud
852758c81c
FIX: Removed concatenation on undeclared variable
2014-09-19 03:05:20 +02:00
Raphaël Doursenaud
332caa2b71
FIX: missing global declaration
2014-09-19 03:05:20 +02:00
aspangaro
0b20369dd7
Qual: Renamed all files & links "fiche.php" into "card.php"
2014-09-18 21:18:25 +02:00
Laurent Destailleur
2b602e7b5a
Qual: Uniformize param names. contactidp -> contactid
2014-09-18 18:46:00 +02:00
Laurent Destailleur
6c522f8772
Merge pull request #1898 from GPCsolutions/ciforeveryone
...
Fixed typo
2014-09-18 17:25:18 +02:00
Laurent Destailleur
5a14a44100
Doxygen
2014-09-18 11:13:23 +02:00
Raphaël Doursenaud
c15849df2d
Fixed typo
2014-09-17 16:40:35 +02:00
Cubexed
9ed77c6060
Closed projects are greyed out in project selector
2014-09-17 15:42:48 +02:00
Laurent Destailleur
a834796181
New: Content of predefined email come firstly from table
...
llx_c_email_template, then translation key.
2014-09-17 01:12:59 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
8487913209
Fix: default setup of type of action
2014-09-15 19:27:45 +02:00
Laurent Destailleur
9ea3e33f94
Fix: Can edit status of event.
...
New: Onto event summary of elements, end date and status are visible.
2014-09-15 19:04:30 +02:00
Laurent Destailleur
19e2bd8c90
New: Add option AGENDA_DEFAULT_TYPE
...
Fix: id is not set on field.
2014-09-15 17:34:32 +02:00
Laurent Destailleur
7fc8799c3d
Qual: Clean code from user table tr td
2014-09-15 16:18:19 +02:00
Laurent Destailleur
2dbbc76645
Fix: Trigger error not reported
2014-09-15 11:48:50 +02:00
Marcos García de La Fuente
7a28f8e4aa
[ bug #1555 ] Update accountancy code of products does not throw PRODUCT_MODIFY trigger
2014-09-14 13:59:06 +02:00
Laurent Destailleur
f264e25514
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/adherents/liste.php
htdocs/compta/bank/bankid_fr.php
htdocs/holiday/index.php
htdocs/opensurvey/list.php
2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214
Fix: SQL injection
2014-09-13 19:04:25 +02:00
Laurent Destailleur
744f370920
Merge remote-tracking branch 'origin/3.6' into develop
2014-09-11 17:47:58 +02:00
Laurent Destailleur
7851587a11
Merge pull request #1869 from FHenry/3.6
...
Extrafield feature select from table should try to translate multiple column when not needed
2014-09-11 17:13:28 +02:00
Laurent Destailleur
f19e469b5f
Work on feature to assign several users to an event.
2014-09-09 14:38:10 +02:00
Laurent Destailleur
9e2a0cb671
Fix: debug of accountancy module
2014-09-09 09:46:57 +02:00
Laurent Destailleur
2fb806bfc2
Fix: duplicate entity encoding into select_array.
2014-09-08 23:08:59 +02:00
Laurent Destailleur
a3bbf2aff9
Fix: Correct height of empty line for thirdparties combo list.
2014-09-08 12:05:24 +02:00
Laurent Destailleur
2f6493dabd
Sync transifex
2014-09-08 11:58:45 +02:00
Laurent Destailleur
342e26f679
Merge
2014-09-07 12:22:04 +02:00
Laurent Destailleur
bf0b578e5a
Fix: Sort at wrong place
...
Fix: sql syntax error (field were renamed)
2014-09-06 16:24:44 +02:00
Laurent Destailleur
522b5a91bc
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:21:09 +02:00
Laurent Destailleur
2b9b110f9c
Fix: Filter on direction of payment mode was not working.
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/fourn/facture/fiche.php
2014-09-06 00:16:24 +02:00
Laurent Destailleur
e7e48f6b2b
Doxygen
...
Add constant to enable bank during proposal (not enough common).
2014-09-04 22:37:33 +02:00
Laurent Destailleur
a57e0d3505
Fix: Do not use   as value of a list
2014-09-04 19:27:59 +02:00
Florian HENRY
85cabbf921
Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
...
Conflicts:
ChangeLog
2014-09-04 18:29:17 +02:00
Laurent Destailleur
b88b4fbc2c
Fix: bad balance of td
2014-09-04 15:17:15 +02:00
Laurent Destailleur
8ec61b8ac6
Fix: bad balance of td
2014-09-04 14:43:16 +02:00
Laurent Destailleur
32fd2e03ce
More log into notify class
2014-09-04 14:38:30 +02:00
Laurent Destailleur
7021f4fb01
Fix: Message show when dir is out of sync with database cache was wrong.
2014-09-03 16:09:14 +02:00
Laurent Destailleur
ca322942ae
I remove the extend into commonobjectline to common object.
...
For the moment, if we need a method for line already into object, i
prefer to see method duplicated.
2014-09-03 09:49:50 +02:00
Florian HENRY
9b40cc9e89
fix
2014-09-02 12:09:43 +02:00
Laurent Destailleur
154d1520fb
Generalize $inputalsopricewithtax instead of MAIN_FEATURES_LEVEL>1
2014-08-30 20:36:53 +02:00
Regis Houssin
48f9ef2574
Fix: php strict mode saga
2014-08-28 15:53:29 +02:00
Regis Houssin
2c46c20dfb
Fix: php strict mode saga
2014-08-28 15:52:58 +02:00
Regis Houssin
139cf10c7c
Fix: php strict mode saga
2014-08-28 15:52:20 +02:00
Regis Houssin
615122bf37
Fix: another strict mode alert
2014-08-28 15:36:57 +02:00
Regis Houssin
714da05034
Fix: another strict mode alert
2014-08-28 15:36:22 +02:00
Regis Houssin
4fdd98c4a7
Fix: another strict mode alert
2014-08-28 15:34:50 +02:00
Alexis Algoud
40aadc8125
add extrafield in add form
2014-08-26 12:11:34 +02:00
aspangaro
f774ff487b
Merge branch 'Upstream/develop'
2014-08-18 11:56:49 +02:00
Laurent Destailleur
be6f99c10e
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/dict.php
htdocs/core/db/mysql.class.php
htdocs/core/db/mysqli.class.php
htdocs/core/lib/ajax.lib.php
2014-08-17 19:34:12 +02:00
Laurent Destailleur
4f206a2125
Fix: Missing empty field
2014-08-17 19:27:25 +02:00
Laurent Destailleur
45927cc986
Fix pb of links into state-region-country:
...
- no more rowid into insert sql requests
- link, so foerign key must be on fk_region->code_region
- label was not visible
- unique keys must be into file .key.sql
2014-08-17 17:47:25 +02:00
Laurent Destailleur
96cb9fe6cb
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-15 02:35:06 +02:00
Laurent Destailleur
c17f5e7f00
Accept property fk_thirdparty instead of fk_soc
2014-08-14 16:04:42 +02:00
Laurent Destailleur
6b26ae6f1f
Fix: Header of tables must use th and not td
2014-08-14 13:30:44 +02:00
Laurent Destailleur
18b44ccfae
Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-favorite
Conflicts:
htdocs/core/class/html.form.class.php
2014-08-14 01:04:15 +02:00
Laurent Destailleur
de3d66eaeb
Merge branch 'develop-accounting3' of github.com:aspangaro/dolibarr into
...
aspangaro-develop-accounting3
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-08-14 00:59:48 +02:00
Laurent Destailleur
40349a9f53
Fix: Removed bad char
2014-08-14 00:55:27 +02:00
Laurent Destailleur
454cb1cbf8
Enhance skeleton
...
Add code_iso3 into array
2014-08-13 19:19:36 +02:00
aspangaro
1a87d98357
Qual: Renamed table llx_c_civilite into llx_c_civility
...
field civilite into label in the same table and field civilite into civility in other table
2014-08-12 06:03:27 +02:00
aspangaro
6fd77e7ef6
Merge branch 'Upstream/develop'
2014-08-11 13:26:58 +02:00
Florian HENRY
aabbc331a4
Fix output extrafield selllist
2014-08-11 13:12:04 +02:00
Florian HENRY
6849f713b5
Fix bug in output extrafields sell list
2014-08-11 13:09:35 +02:00
Laurent Destailleur
4ce2495a33
Fix: Parameter morefilter is missing.
2014-08-11 11:45:25 +02:00
Laurent Destailleur
b713bd7b88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-11 11:31:10 +02:00
Laurent Destailleur
d85f319a86
New: Select list of users can return user into hierarchy.
2014-08-11 11:29:47 +02:00
aspangaro
9af336b53b
Add accountancy code for trips & fees and renamed libelle field into label
2014-08-10 20:41:52 +02:00
aspangaro
0738103da8
Renamed llx_c_pays to llx_c_country & field "libelle" to "label"
2014-08-10 13:37:39 +02:00
Laurent Destailleur
4922071af9
New: When a translation is not available we always jump to en_US and
...
only en_US.
2014-08-08 10:50:37 +02:00
Laurent Destailleur
111d215ef1
Merge pull request #1807 from atm-maxime/develop
...
New: Intervention documents are now available in ECM module
2014-08-08 01:56:33 +02:00
Laurent Destailleur
42d992b009
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/lib/project.lib.php
htdocs/fourn/facture/fiche.php
htdocs/projet/class/project.class.php
2014-08-08 01:26:53 +02:00
Maxime Kohlhaas
3b14fa2b35
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2014-08-07 12:27:46 +02:00
Laurent Destailleur
a49bce10de
Fix: When disabled, all fields must be disabled. Need backport.
...
Conflicts:
htdocs/projet/activity/list.php
2014-08-07 12:09:28 +02:00
Laurent Destailleur
ebc11a7a9c
Fix: When disabled, all fields must be disabled. Need backport.
2014-08-07 11:50:25 +02:00
Laurent Destailleur
96b49cfabe
Fix: When disabled, all fields must be disabled. Need backport.
2014-08-07 11:08:36 +02:00
Laurent Destailleur
20cef1512f
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-06 21:34:47 +02:00
Laurent Destailleur
98eb39bf9c
Fix: PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS is correctly supported
2014-08-06 16:46:04 +02:00
Maxime Kohlhaas
5e63f16d32
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
...
Conflicts:
ChangeLog
2014-08-06 09:58:10 +02:00
Laurent Destailleur
2624632fde
Fix: bad test commande_send -> order_send
2014-08-05 19:55:14 +02:00
Laurent Destailleur
e95a9cad03
New: When force of bcc is set, we show it onto email form.
2014-08-05 19:32:24 +02:00
Maxime Kohlhaas
1b3efbb9a3
New : add attachments on user cards
2014-08-05 16:01:40 +02:00
Maxime Kohlhaas
90c397d1a4
New: Intervention documents are now available in ECM module
2014-08-05 15:24:49 +02:00
Laurent Destailleur
20d6920a0c
Add comment
2014-08-05 09:27:40 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +02:00
Laurent Destailleur
76353bf427
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/impayees.php
htdocs/core/lib/functions.lib.php
htdocs/main.inc.php
2014-08-04 22:18:30 +02:00
Laurent Destailleur
b8a0f6aec9
New: Add option to foce delivery receipt to yes
2014-08-04 19:03:15 +02:00
Laurent Destailleur
3024d82536
Merge pull request #1786 from atm-maxime/develop
...
Fix on class not extending commonobject
2014-08-04 08:58:54 +02:00
Laurent Destailleur
1f2cc71975
New: Supervisor is now visible into user list.
2014-08-03 11:36:00 +02:00
Florian HENRY
b0011d0514
remove debug
2014-08-01 16:50:47 +02:00
Florian HENRY
17e272c8ac
Fix extrafield parameters for sellist
2014-08-01 16:48:16 +02:00
Florian HENRY
44f06bef22
Unpaid invoice launch fusion PDF action even if it is only search (with
...
enter keyboard input instead of lens click)
2014-08-01 15:21:29 +02:00
Florian HENRY
139dfa5b80
Fix : Fusion PDF button on unpaid invoice is no more displayed
2014-08-01 15:05:43 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Maxime Kohlhaas
94fee7af70
Call trigger added in commonobjectline
2014-08-01 08:59:08 +02:00
Laurent Destailleur
852b78f79f
Removed 2 other call to getStaticMember (pb with php 5.5).Fix PHPCS for
...
constants into database driver classes.
2014-08-01 00:53:29 +02:00
Laurent Destailleur
8e5cbb1f6c
Merge branch 'patch-2' of github.com:marcosgdf/dolibarr into
...
marcosgdf-patch-2
Conflicts:
test/phpunit/Functions2LibTest.php
2014-07-31 17:21:46 +02:00
Marcos García de La Fuente
1c97b3f779
Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode
2014-07-30 15:47:19 +02:00
Laurent Destailleur
2d97ad5177
Merge pull request #1771 from frederic34/selectdelivery
...
Select Shipping Method in Propal, Order
2014-07-30 11:31:22 +02:00
Laurent Destailleur
6226d39cda
Fix: Pb when option javascript disabled.
2014-07-29 19:45:48 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
c9d27383a4
Fix: When option to use optimize display for text borwser and blin
...
person is on, box addon was broken.
2014-07-29 00:50:57 +02:00
Laurent Destailleur
096a61d5c0
Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong
...
translate.
2014-07-28 20:35:32 +02:00
frederic34
6d5767e464
Merge remote branch 'upstream/develop' into selectdelivery
2014-07-28 20:15:40 +02:00
Laurent Destailleur
c20256f702
Fix: [ bug #1542 ] extrafields.class.php, showOutputField wrong
...
translate.
2014-07-28 20:12:01 +02:00
Laurent Destailleur
3011ecf6df
Fix: PHPCS
2014-07-28 19:55:12 +02:00
Laurent Destailleur
827bf4b22a
Merge pull request #1778 from frederic34/patch-2
...
Update html.form.class.php
2014-07-28 19:48:16 +02:00
frederic34
395b003266
Merge remote branch 'upstream/develop' into selectdelivery
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-28 17:10:07 +02:00
frederic34
36c5b2d69c
Update html.form.class.php
...
By example, avoid to have html code in customer name
2014-07-28 14:04:55 +02:00
Laurent Léonard
0228cd9db7
Fix translations in e-mail forms
2014-07-28 02:45:58 +02:00
Laurent Destailleur
bf9313dd87
getBrowserInfo can return type of layout (classic/phone/tablet)
2014-07-27 20:56:26 +02:00
Laurent Destailleur
b964f9e9e3
New: Add info page about browser.
...
Qual: Removed dedicated code to change top menu according to
dol_optimize_smallscreen. We must use instead size of screen into css.
2014-07-27 14:13:25 +02:00
frederic34
5258c522ce
Some cleaning
2014-07-25 23:20:19 +02:00
frederic34
2df2c12cfd
The delivery method is transmited in shipment
2014-07-25 21:50:21 +02:00
frederic34
f0a7cc3268
Select Shipping Method in Propal
2014-07-24 18:08:08 +02:00
frederic34
5ef626813c
Update html.form.class.php
2014-07-23 09:49:58 +02:00
Laurent Destailleur
cfc337a79a
Qual: Enable php checkstyle rule Zend.Files.ClosingTag
...
Fix: Solve a lot of checkstyle errors.
2014-07-20 15:27:38 +02:00
Laurent Destailleur
f46db55f71
Merge pull request #1753 from marcosgdf/triggers-refactor
...
Refactored Dolibarr triggers
2014-07-20 04:52:27 +02:00
Laurent Destailleur
8137fd7fe4
Fix: Type of line (product/service) could not be edited on supplier
...
order/invoice.
2014-07-20 02:36:03 +02:00
Laurent Destailleur
04a20d2008
- New: Enable feature developed for 3.6 we forgot to enabled: Adding
...
prefix on uploaded file names.
- New: No more dependency between contract and service module.
2014-07-19 22:05:35 +02:00
Laurent Destailleur
b42a33b203
Fix: For contract, only services available by default. Product appears
...
if option is set only.
2014-07-19 21:14:56 +02:00
Marcos García de La Fuente
7e29889eab
Fixed little bug
2014-07-18 03:13:15 +02:00
Marcos García de La Fuente
c8338f45c4
Refactored Dolibarr triggers:
...
Created a DolibarrTriggers abstract class.
Moved common variables out of construct class
Improved run_trigger method signature
2014-07-18 02:59:46 +02:00
Laurent Destailleur
6a19cc614a
Merge pull request #1737 from GPCsolutions/accessibility
...
Accessibility
2014-07-16 15:15:03 +02:00
Laurent Destailleur
8a8a90de78
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-07-15 23:30:15 +02:00
Laurent Destailleur
9acf60d7c5
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
.travis.yml
ChangeLog
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/core/class/html.formfile.class.php
2014-07-14 23:36:10 +02:00
Laurent Destailleur
32a6d59b64
Merge pull request #1734 from FHenry/3.5
...
Fix
2014-07-14 23:13:03 +02:00
Marcos García de La Fuente
4bc8e026b6
[ bug #1526 ] Thumbs of files uploaded with dots in their names do not load correctly
2014-07-13 19:51:44 +02:00
Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
94bcb0dc40
Labels and autofocus for company card forms
2014-07-12 14:45:23 +02:00
Raphaël Doursenaud
f1853c435b
More labels and autofocus for thirdparty and contact forms
2014-07-12 12:04:39 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
Raphaël Doursenaud
78ce6c0b1c
Added labels on form elements for company creation
2014-07-11 19:57:51 +02:00
Florian HENRY
b9df48d48c
Fix
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
2014-07-11 15:53:31 +02:00
KreizIT
b8499a80ec
Refactor: LINK_* trigger
2014-07-11 15:08:01 +02:00
Laurent Destailleur
728ca22183
Merge pull request #1730 from GPCsolutions/accessibility
...
Accessibility
2014-07-11 14:57:02 +02:00
Laurent Destailleur
4dfaf9ce38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661
New: Type of thirdparties can accept a country (to show list of types
...
specific for a country).
2014-07-11 13:56:35 +02:00
Raphaël Doursenaud
55d062784d
Added labels on objectline form elements
2014-07-11 13:25:44 +02:00
Florian HENRY
3f23b116c6
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
...
projet
2014-07-11 11:44:54 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Laurent Destailleur
688d58413b
Merge pull request #1710 from aspangaro/develop-accounting2
...
New feature :: Add fiscal year
2014-07-07 21:28:35 +02:00
frederic34
0cb5220d4d
Use english for the function name
2014-07-07 20:54:41 +02:00
frederic34
9949713d20
Some cleaning
2014-07-07 18:40:18 +02:00
KreizIT
4e08e2b5d5
Fix rollback and test errno
2014-07-07 11:32:56 +02:00
Laurent Destailleur
96ec3ad7f4
Fix: Allow percent to solve presentation pb by some pages.
2014-07-07 00:14:24 +02:00
Laurent Destailleur
4dbc1dd1c6
Merge remote-tracking branch 'origin/3.6' into develop
2014-07-06 21:09:10 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +02:00
aspangaro
e294fe1edd
Update
2014-07-05 21:58:39 +02:00
aspangaro
7892852f44
Merge branch 'Upstream/develop'
2014-07-05 21:56:47 +02:00
Florian HENRY
02574a7af2
Fix Ajax combobox in Extrafeilds
...
Add Extrafield on contract
2014-07-05 11:17:50 +02:00
Laurent Destailleur
fa82cbceb9
Qual: Removed useless function
2014-07-05 08:59:41 +02:00
aspangaro
9eaeaae2fb
Merge branch 'Upstream/develop'
2014-07-05 08:48:51 +02:00
aspangaro
be78e96313
Bug fix & add tab info
2014-07-05 08:47:01 +02:00
Laurent Destailleur
8e2999f73f
Fix: phpcs
2014-07-04 14:19:03 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
aspangaro
a2ac578712
Merge branch 'Upstream/develop'
2014-07-04 06:21:00 +02:00
Juanjo Menent
24b2b83b85
use count() instead sizeof()
2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with company
2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
31c27b8f7c
New: More option to define default filter setting of agenda views.
2014-06-29 23:35:00 +02:00
aspangaro
46320071a0
Merge branch 'Upstream/develop'
2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d
Update
2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94
Fix: typo
2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9
New: Add hook "searchAgendaFrom".
2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5
New: Can filter events on a group of users.
2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3
New: Can create proposal from an intervention.
2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
...
sender.
2014-06-28 14:48:00 +02:00
Laurent Destailleur
7d72b6c3a1
Add comments
2014-06-28 14:06:29 +02:00
Laurent Destailleur
29dfb71bbd
Merge branch 'patch-11' of github.com:defrance69/dolibarr into
...
defrance69-patch-11
Conflicts:
htdocs/core/class/commonobject.class.php
2014-06-26 23:04:26 +02:00
BENKE Charles
8acd702cd1
Using hidden constant to use the feature
...
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
2014-06-26 22:34:40 +02:00
Laurent Destailleur
a2f610ffbe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a
Merge pull request #1686 from KreizIT/movetrig
...
Fix [ bug #1459 ]
2014-06-26 21:01:48 +02:00
