Laurent Destailleur
|
46b281f703
|
Fix for #7697
|
2017-12-01 19:29:29 +01:00 |
|
Laurent Destailleur
|
89ef597690
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-12-01 18:12:52 +01:00 |
|
Laurent Destailleur
|
4969ae2abb
|
Fix missing the badge on virtual product tab
|
2017-12-01 17:48:51 +01:00 |
|
Laurent Destailleur
|
e36b62f539
|
Merge pull request #7900 from fappels/7.0_fix_warehouse_label_ref-
Fix dispatch not adapted for label to ref change for warehouse
|
2017-12-01 16:26:21 +01:00 |
|
Laurent Destailleur
|
1ce155728f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/mailings/fraise.modules.php
|
2017-12-01 16:25:13 +01:00 |
|
fappels
|
1c72dc608f
|
Fix travis
|
2017-12-01 16:22:34 +01:00 |
|
Laurent Destailleur
|
1d2b5dbe97
|
Merge pull request #7892 from atm-maxime/fix_contactlist_empty
Fix filters on contact list must always appear
|
2017-12-01 15:54:03 +01:00 |
|
Laurent Destailleur
|
ce32da6217
|
Fix debugs APIs
|
2017-12-01 15:39:18 +01:00 |
|
Laurent Destailleur
|
09e611aa21
|
Move status of blockedlog to experimental
|
2017-12-01 13:41:37 +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
|
6796c08cb8
|
Debug/rewrite Blockedlog
|
2017-11-30 14:21:55 +01:00 |
|
Laurent Destailleur
|
39fdd1b37d
|
Use correct link to changelog
|
2017-11-30 11:16:28 +01:00 |
|
Maxime Kohlhaas
|
879a0812d7
|
Fix filters on contact list must always appear
|
2017-11-29 20:04:15 +01:00 |
|
Laurent Destailleur
|
acd2d0121d
|
Merge pull request #7886 from ptibogxiv/patch-8
Fix for multicompany
|
2017-11-29 15:31:21 +01:00 |
|
Laurent Destailleur
|
9fa6bfd1a5
|
Fix edit external user or not
|
2017-11-29 15:30:41 +01:00 |
|
ptibogxiv
|
c194538609
|
Update fraise.modules.php
|
2017-11-29 10:45:16 +01:00 |
|
ptibogxiv
|
883c9dbf99
|
Fix for multicompany
last fix for multicompany compliance
|
2017-11-29 09:28:03 +01:00 |
|
Laurent Destailleur
|
3b98a06ebb
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/mailings/fraise.modules.php
|
2017-11-28 12:18:01 +01:00 |
|
Laurent Destailleur
|
07bdd3213a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-28 12:16:13 +01:00 |
|
Laurent Destailleur
|
430c72bf0f
|
Merge pull request #7879 from ptibogxiv/patch-7
fix for multicompany in mailing
|
2017-11-28 12:16:00 +01:00 |
|
Laurent Destailleur
|
c1e6d35ca5
|
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
factorization of extrafields into list
|
2017-11-28 12:14:47 +01:00 |
|
Laurent Destailleur
|
f8d6897888
|
Fix bug
|
2017-11-28 12:08:04 +01:00 |
|
Laurent Destailleur
|
b14cb7a97f
|
Debug accountancy
|
2017-11-28 11:49:11 +01:00 |
|
Laurent Destailleur
|
a15a57317b
|
Debug accountancy module
|
2017-11-28 11:12:13 +01:00 |
|
Laurent Destailleur
|
a9d3e90b70
|
Big debug of accountancy module
|
2017-11-27 21:53:22 +01:00 |
|
ptibogxiv
|
10b0eafba7
|
Update fraise.modules.php
|
2017-11-27 18:12:52 +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 |
|
ptibogxiv
|
ea9071512d
|
Update fraise.modules.php
|
2017-11-27 17:08:15 +01:00 |
|
ptibogxiv
|
0a5a50263d
|
fix for multicompany
|
2017-11-27 16:07:40 +01:00 |
|
Laurent Destailleur
|
57d4f28cba
|
Enhance usability of accounting module
|
2017-11-27 15:51:28 +01:00 |
|
ptibogxiv
|
a9e4fcfdca
|
Update fraise.modules.php
|
2017-11-27 15:49:28 +01:00 |
|
florian HENRY
|
94285ae494
|
factorization of extrafeild into list
|
2017-11-27 15:24:29 +01:00 |
|
ptibogxiv
|
780e8ce470
|
fix for multicompany
|
2017-11-27 15:13:14 +01:00 |
|
Laurent Destailleur
|
b55d085f2d
|
Merge pull request #7872 from atm-alexis/fix_include_for_ajax_select_product_supplier_order
fix include for ajax select product supplier order
|
2017-11-27 14:55:11 +01:00 |
|
Laurent Destailleur
|
807bfbb696
|
Merge pull request #7867 from frederic34/bank
info bank
|
2017-11-27 14:50:00 +01:00 |
|
Scrutinizer Auto-Fixer
|
aab2799981
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-11-27 13:48:36 +00:00 |
|
Laurent Destailleur
|
f9e99e93c3
|
Fux utf8 trouble on direct printing message
|
2017-11-27 14:34:29 +01:00 |
|
Laurent Destailleur
|
69725fe62f
|
Fix setup of direct print with google docs driver
|
2017-11-27 13:55:27 +01:00 |
|
Laurent Destailleur
|
43c60ec224
|
Fix error management at wrong place
|
2017-11-27 13:45:59 +01:00 |
|
alexis Algoud
|
61a3131fc4
|
fix include for ajax select product supplier order
|
2017-11-27 10:59:46 +01:00 |
|
Laurent Destailleur
|
b142ac1c06
|
CSS
|
2017-11-26 22:12:11 +01:00 |
|
Laurent Destailleur
|
e4d0213916
|
Removed duplicate code
|
2017-11-26 22:06:14 +01:00 |
|
Laurent Destailleur
|
a0406bc741
|
Standardize view of events for products
|
2017-11-26 20:24:20 +01:00 |
|
Laurent Destailleur
|
7e40ee5e4b
|
Fix substitution key for constant ok with php 5.3
|
2017-11-25 23:16:15 +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 |
|
Frédéric FRANCE
|
6a91b16995
|
info bank
|
2017-11-25 12:13:03 +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
|
b8251bac97
|
Fix rename files with accents
|
2017-11-25 00:48:19 +01:00 |
|
Laurent Destailleur
|
4cff4c6935
|
Simplify and standardize code for agenda pages
|
2017-11-25 00:12:45 +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
|
63d2d38c5f
|
Fix export stock with lot
|
2017-11-24 17:47:40 +01:00 |
|
Laurent Destailleur
|
8659d97e97
|
Fix export of lot must use properties of lot from product_lot
|
2017-11-24 17:44:19 +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
|
0370368d04
|
Restore lost field during merge
|
2017-11-24 16:46:50 +01:00 |
|
Laurent Destailleur
|
d7f5f14f46
|
Merge branch 'develop' into new_export_stock_valo
|
2017-11-24 16:40:36 +01:00 |
|
Laurent Destailleur
|
aa2397ff1d
|
Merge pull request #7859 from vvnt/patch-9
modPropale.class.php permissions in English
|
2017-11-24 16:34:02 +01:00 |
|
Laurent Destailleur
|
8bd2707678
|
Merge pull request #7858 from vvnt/patch-8
modFacture.class.php permissions in English
|
2017-11-24 16:33:42 +01:00 |
|
Laurent Destailleur
|
a18824050c
|
Merge pull request #7857 from vvnt/patch-7
modSociete.class.php permissions in English
|
2017-11-24 16:33:22 +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
|
438a68968f
|
Fix regression
|
2017-11-24 16:28:24 +01:00 |
|
Laurent Destailleur
|
831099fef8
|
Debug modulebuilder
|
2017-11-24 16:24:42 +01:00 |
|
Laurent Destailleur
|
3db52b5f9e
|
Debug responsive of v7
|
2017-11-24 14:23:25 +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 |
|
Maxime Kohlhaas
|
cad2fedf70
|
New add pmp and cost price in product stock export
|
2017-11-23 18:41:48 +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 |
|
Laurent Destailleur
|
295b4483d4
|
Enhance the repair.php tool
|
2017-11-23 13:23: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 |
|
vvnt
|
09f4abd38e
|
modPropale.class.php permissions in English
|
2017-11-22 23:22:43 +01:00 |
|
vvnt
|
10ba9a2fee
|
modFacture.class.php permissions in English
|
2017-11-22 23:16:15 +01:00 |
|
vvnt
|
1b646f755d
|
modSociete.class.php permissions in English
|
2017-11-22 23:11:36 +01:00 |
|
Laurent Destailleur
|
5a2fe13958
|
Fix travis
|
2017-11-22 21:36:01 +01:00 |
|
Laurent Destailleur
|
b0cecab22b
|
Removed useless code
|
2017-11-22 21:26:24 +01:00 |
|
Laurent Destailleur
|
240f67d82b
|
Disable tab if not on develop mode
|
2017-11-22 21:23:42 +01:00 |
|
Laurent Destailleur
|
5fa8db1650
|
Work on timesheets
|
2017-11-22 21:19:40 +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 |
|
Laurent Destailleur
|
d2b3fc5813
|
Merge pull request #7849 from IonAgorria/resources-card
NEW: Merge resource/add.php to resource/card.php
|
2017-11-22 11:33:56 +01:00 |
|
Laurent Destailleur
|
30d0c4f210
|
Merge pull request #7845 from vvnt/patch-6
modSociete.class.php (spelling correction)
|
2017-11-22 11:33:03 +01:00 |
|
Laurent Destailleur
|
918a51b9da
|
Merge pull request #7844 from vvnt/patch-5
modPropale.class.php (spelling correction)
|
2017-11-22 11:28:25 +01:00 |
|
Laurent Destailleur
|
f6cc441c2e
|
Merge pull request #7843 from vvnt/patch-4
Update modFacture.class.php (Spelling correction)
|
2017-11-22 11:28:05 +01:00 |
|
Laurent Destailleur
|
62da0160e1
|
Merge pull request #7780 from fappels/develop_update_tablednd
FIX #3551 and #6823 table drag and drop not working.
|
2017-11-22 11:22:14 +01:00 |
|
Laurent Destailleur
|
c3d8ef2104
|
Update functions.lib.php
|
2017-11-22 11:14:52 +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 |
|
Regis Houssin
|
848a27283b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member
|
2017-11-22 09:51:57 +01:00 |
|
Regis Houssin
|
1595bb1148
|
NEW add possibility to remove address field
|
2017-11-22 09:51:46 +01:00 |
|
Ion
|
7c6622f5b3
|
Merge resource/add.php to resource/card.php
|
2017-11-21 20:12:55 +01:00 |
|
vvnt
|
c74eef03dd
|
modSociete.class.php (spelling correction)
Minor spelling correction.
|
2017-11-21 15:17:02 +01:00 |
|
vvnt
|
005be3f69b
|
modPropale.class.php (spelling correction)
Minor spelling correction
|
2017-11-21 15:13:13 +01:00 |
|
vvnt
|
98998a7060
|
Update modFacture.class.php
|
2017-11-21 15:07:53 +01:00 |
|
Laurent Destailleur
|
2b95679b84
|
Add info to help spam fight
|
2017-11-21 14:09:15 +01:00 |
|
Laurent Destailleur
|
a630e665d9
|
Work on modulebuilder
|
2017-11-21 11:50:57 +01:00 |
|
Laurent Destailleur
|
4b4412d5da
|
Standardize file names for ECM
|
2017-11-20 19:40:34 +01:00 |
|
Laurent Destailleur
|
e19ca7b6d4
|
Work on generic filemanager
|
2017-11-20 18:19:41 +01:00 |
|
Laurent Destailleur
|
818f43e7ad
|
Work on generic filemanager
|
2017-11-19 22:04:24 +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
|
248a359ac9
|
Fix phpcs
|
2017-11-19 16:30:05 +01:00 |
|
Laurent Destailleur
|
304819a726
|
Work on module builder
|
2017-11-19 16:26:39 +01:00 |
|
Laurent Destailleur
|
4938a0ba2a
|
Add param forcenowrap on tooltip function
|
2017-11-19 12:41:37 +01:00 |
|
Laurent Destailleur
|
47afe470eb
|
Merge small js into lib_header.js.php
Move filemanager.tpl.php
CSS enhancement
|
2017-11-19 12:22:01 +01:00 |
|
Laurent Destailleur
|
9b1470dab5
|
Work on generic filemanager component
|
2017-11-18 22:13:19 +01:00 |
|
Laurent Destailleur
|
bcaccb1829
|
Add layout into link of sub resources to solve undesired cache effect
|
2017-11-18 12:35:25 +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
|
80bdb45be8
|
Look and feel v6 - Show status of thirdparty in dol_banner
|
2017-11-18 01:48:16 +01:00 |
|
Laurent Destailleur
|
742bf29c65
|
Look and feel v6 - Show status of thirdparty in dol_banner
|
2017-11-18 01:29:42 +01:00 |
|
Laurent Destailleur
|
7349b5d793
|
Fix php 7.2
|
2017-11-17 17:23:56 +01:00 |
|
Laurent Destailleur
|
2705030006
|
Code comment
|
2017-11-17 15:34:15 +01:00 |
|
Laurent Destailleur
|
2cb190fc5c
|
Fix return code
|
2017-11-17 15:27:59 +01:00 |
|
Laurent Destailleur
|
776f999b71
|
Merge branch 'develop' into develop_update_tablednd
|
2017-11-17 15:10:09 +01:00 |
|
Laurent Destailleur
|
ead629708c
|
Look and feel v6
|
2017-11-17 14:57:14 +01:00 |
|
Laurent Destailleur
|
405275693f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/replenishorders.php
htdocs/projet/activity/perday.php
|
2017-11-17 14:20:08 +01:00 |
|
Laurent Destailleur
|
68f477eaf7
|
Merge pull request #7818 from dolibarr95/patch-29
Fix : syntax error in dol_print_graph()
|
2017-11-17 13:18:11 +01:00 |
|
Laurent Destailleur
|
e06087888b
|
NEW Show line "other filtered task" when using filter on timesheet.
|
2017-11-16 22:55:04 +01:00 |
|
Laurent Destailleur
|
f153d9c9ff
|
Fix time spent counted twice
|
2017-11-16 19:41:31 +01:00 |
|
Laurent Destailleur
|
4f25bc5e3b
|
NEW detection of edge browser
|
2017-11-16 14:44:55 +01:00 |
|
Laurent Destailleur
|
c527189088
|
Standardize page name
|
2017-11-16 12:18:25 +01:00 |
|
dolibarr95
|
c6c1552c01
|
syntax error
bad syntax when add an url in dol_print_graph()
|
2017-11-15 11:11:45 +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
|
501f5b8292
|
Merge duplicate translation key
|
2017-11-14 18:26:39 +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 |
|
florian HENRY
|
e195cf0b95
|
fix : return vat code for supplier price
|
2017-11-14 09:53:06 +01:00 |
|
Laurent Destailleur
|
11cb9c0d81
|
Code simpler
|
2017-11-14 01:57:50 +01:00 |
|
Laurent Destailleur
|
31e152274c
|
NEW Add 2 new automatic classification in workflow module
|
2017-11-14 01:00:57 +01:00 |
|
Laurent Destailleur
|
a2c80a704f
|
Code comment
|
2017-11-13 19:06:58 +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
|
97c9549087
|
Fix ref supplier must be output if it exists, even for free products
|
2017-11-13 11:30:41 +01:00 |
|
Laurent Destailleur
|
d59ad412a4
|
Clean code
|
2017-11-13 11:01:09 +01:00 |
|
Laurent Destailleur
|
f33182acc5
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-11-12 20:49:53 +01:00 |
|
Laurent Destailleur
|
53a523ba9d
|
Module builder
|
2017-11-12 20:45:06 +01:00 |
|
Laurent Destailleur
|
d421b90376
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-11-12 20:18:56 +01:00 |
|
Laurent Destailleur
|
356525730d
|
FIX #7786
|
2017-11-12 20:12:56 +01:00 |
|
Laurent Destailleur
|
bf121f9b3c
|
Work on saving supplier_ref into database lines
|
2017-11-12 19:29:03 +01:00 |
|