Commit Graph

53010 Commits

Author SHA1 Message Date
Laurent Dinclaux
253f7e252d Fixes local taxes repports by rate 2017-07-10 13:15:14 +11:00
Laurent Destailleur
fd89535037 Debug module website 2017-07-09 22:30:19 +02:00
Laurent Destailleur
3c576dcf21 Fix bad name of tables 2017-07-09 20:57:45 +02:00
Laurent Destailleur
10cb7b2524 Fix remove warnings 2017-07-09 20:31:27 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
aa66676b7d Quick hack to solve missing alias name on doc. 2017-07-09 15:15:23 +02:00
Laurent Destailleur
9fc17d8988 Translation 2017-07-09 13:43:23 +02:00
fappels
13d6664ab4 Fix delete product from product card 2017-07-09 12:47:51 +02:00
Laurent Destailleur
b61f7c0179 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-08 22:17:29 +02:00
Laurent Destailleur
65ea0fc2b4 FIX value of user id filled to 0 in llx_bank_url when recording an
expense report.
2017-07-08 22:16:35 +02:00
Laurent Destailleur
9d0cb07ff9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/expensereport/payment/payment.php
2017-07-08 21:54:37 +02:00
Laurent Destailleur
7b6e60077a FIX id of user not saved when making a payment of expense report 2017-07-08 21:53:28 +02:00
Laurent Destailleur
45d8fbb19e Fix gravatar 2017-07-08 21:39:48 +02:00
Laurent Destailleur
d223283359 Fix phpcs 2017-07-08 20:59:53 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
8a9c38114f Fix bug reported by scrutinizer 2017-07-08 19:05:51 +02:00
Laurent Destailleur
00e1fab1af Fix bad var 2017-07-08 19:01:09 +02:00
Laurent Destailleur
f32b27e8bd Better management of vat with code 2017-07-08 18:50:58 +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
4290be7ee6 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-08 18:10:02 +02:00
Laurent Destailleur
ba3b6b6aa5 Better support of vat with code in expense report 2017-07-08 18:09:45 +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
4f75b6d656 Fix phpcs 2017-07-08 14:58:19 +02:00
Laurent Destailleur
9f486716c1 Fix phpcs 2017-07-08 14:56:43 +02:00
Laurent Destailleur
49689fc56f Fix bad extension 2017-07-08 14:30:16 +02:00
Laurent Destailleur
2ea7f38d38 Fix migration of version that is not a final version 2017-07-08 12:48:17 +02:00
Laurent Destailleur
a9468ad84a Look and feel v6 2017-07-08 00:42:55 +02:00
Laurent Destailleur
e1ba69eee0 Fix edit of automatic event should keep its type. 2017-07-08 00:19:30 +02:00
Laurent Destailleur
fbca244212 Fix must go back to next version 2017-07-07 23:19:15 +02:00
Laurent Destailleur
eff4282cc2 Clean files 2017-07-07 22:19:01 +02:00
Laurent Destailleur
5ad6d70397 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 22:05:01 +02:00
Laurent Destailleur
4bae65bedc Fix travis 2017-07-07 22:04:29 +02:00
Laurent Destailleur
efd292e8f5 Merge pull request #7126 from atm-gauthier/FIX_add_contact
FIX : we have to check if contact doesn't already exist on add_contact
2017-07-07 20:33:24 +02:00
Laurent Destailleur
1d35c87c18 Merge pull request #7125 from aspangaro/6.0-fec3
Fix some problems
2017-07-07 20:32:27 +02:00
Laurent Destailleur
34d0c79e32 Merge pull request #7124 from fappels/develop_updateline_notriggerflag
New add trigger disable to updateline functions
2017-07-07 20:30:04 +02:00
Laurent Destailleur
02aa4f7e0c Fix permission to show details of project 2017-07-07 20:28:43 +02:00
Laurent Destailleur
749e5eb7f4 Fix link 2017-07-07 20:24:39 +02:00
Laurent Destailleur
0d8f382ca4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 20:16:04 +02:00
Laurent Destailleur
5046852caa Merge pull request #7121 from jfefe/patch-14
Bad path for document file
2017-07-07 20:15:18 +02:00
Laurent Destailleur
bd0dba6439 Update card.php
Better fix for future
2017-07-07 20:14:47 +02:00
Laurent Destailleur
b461d24f52 Merge pull request #7119 from atm-alexis/FIX_situ_pdf_total_VAT
FIX invoice situation VAT total rounding into PDF crabe
2017-07-07 20:11:55 +02:00
Laurent Destailleur
249bfa3412 Merge pull request #7117 from atm-arnaud/FIX_insert_supplierpropale_det
Fix add supplierproposaldet without price (new product)
2017-07-07 20:09:52 +02:00
Laurent Destailleur
441c4b9b71 Merge pull request #7115 from atm-florian/dev_fix_accountancy
FIX accountancy right management on setup pages
2017-07-07 20:08:21 +02:00
Laurent Destailleur
3270d141b0 Update index.php 2017-07-07 20:07:28 +02:00
Laurent Destailleur
5eaf49a265 Update journals_list.php 2017-07-07 20:05:32 +02:00
Laurent Destailleur
2dd9cb61a6 Update export.php 2017-07-07 20:04:29 +02:00
Laurent Destailleur
51a9c4fad5 Update defaultaccounts.php 2017-07-07 20:03:57 +02:00
Laurent Destailleur
d880c943ae Update categories_list.php 2017-07-07 20:03:39 +02:00
Laurent Destailleur
0fc6f6920e Update categories.php 2017-07-07 20:03:14 +02:00
Laurent Destailleur
bcbd2a8a91 Merge pull request #7108 from atm-ph/fix_develop_import_update
Fix update row on xlsx import do not work as csv import
2017-07-07 20:00:28 +02:00
Laurent Destailleur
0d575b4cdf Merge pull request #7107 from atm-john/fix_contract_card
Fix return method
2017-07-07 19:58:27 +02:00
Laurent Destailleur
71d360b4a0 Merge pull request #7105 from hregis/develop_bug2
Fix: check if action type is different of 'user' (external module)
2017-07-07 19:57:26 +02:00
Laurent Destailleur
0eb6a25342 Merge pull request #7104 from tuxgasy/develop_shipment_failed_no_error
Fix #7103 : No error message on validate shipment if stock movement failed
2017-07-07 19:55:32 +02:00
Laurent Destailleur
608e9e1c82 Look and feel v6 (no amount symbol into list) 2017-07-07 19:48:35 +02:00
Laurent Destailleur
552031799d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 19:42:37 +02:00
Laurent Destailleur
de24e93cca Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list
NEW: Add column with nbr suppliers prices and WAP to product list.
2017-07-07 19:42:25 +02:00
Laurent Destailleur
b7af0cca63 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/holiday/card.php
2017-07-07 19:39:57 +02:00
Laurent Destailleur
aa4ff464d6 Merge pull request #7096 from fappels/6.0_fix_virtual_stock_read_rights_third_parties
FIX: Ignore third party read rights filter for virtual stock calculation.
2017-07-07 19:34:12 +02:00
Laurent Destailleur
a026e1d701 Close #7095 2017-07-07 19:32:03 +02:00
Laurent Destailleur
c459d3aa7a FIX user that modify not set 2017-07-07 19:23:19 +02:00
Laurent Destailleur
4b11921cb6 Merge pull request #7087 from OPEN-DSI/core_fourn_command_link_now_order_date_and_delivery_date
FIX: In supplier order, show link Now for order date and delivery date
2017-07-07 19:18:25 +02:00
Laurent Destailleur
0a7a092080 FIX Missing ref 2017-07-07 19:17:53 +02:00
Laurent Destailleur
fd5f992be4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-07-07 19:15:18 +02:00
Laurent Destailleur
c66f67ee80 Merge pull request #7106 from atm-ph/fix_develop_sql_migration
Fix sql syntax
2017-07-07 19:15:05 +02:00
Laurent Destailleur
be493b78ba Merge pull request #7093 from Darkjeff/Fix-Accoutancy
Fix accoutancy
2017-07-07 19:14:35 +02:00
Laurent Destailleur
4c1b485d47 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
Conflicts:
	htdocs/compta/facture/list.php
2017-07-07 19:06:25 +02:00
Laurent Destailleur
c6fc7313b1 Merge pull request #7116 from atm-ph/fix_7109
FIX 7109 - class name already exist for customer payment
2017-07-07 19:01:10 +02:00
Laurent Destailleur
d58682c574 Merge pull request #7088 from atm-arnaud/FIX_edit_social_emptying_label
FIX edit sociale was emptying label
2017-07-07 18:59:10 +02:00
Laurent Destailleur
47c6a324ac Merge pull request #7086 from OPEN-DSI/core_commande_warning_delay_dashboard
FIX: Function load_board in commande.class.php for warnings delay in dashboard
2017-07-07 18:56:31 +02:00
Laurent Destailleur
451508ba20 Merge pull request #7084 from atm-florian/develop
FIX Transfer between account with different currencies
2017-07-07 18:54:03 +02:00
Laurent Destailleur
b0359b4659 Merge pull request #7081 from atm-florian/5.0
fix class error (given by eclipse Oxygen version)
2017-07-07 18:35:47 +02:00
Laurent Destailleur
eef027acb4 Merge pull request #7080 from atm-arnaud/FIX_holidays_postgresql
FIX holidays postgresql search
2017-07-07 18:31:54 +02:00
Laurent Destailleur
640f66f017 Fix SQL syntax 2017-07-07 17:34:56 +02:00
florian HENRY
1c647e2898 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2017-07-07 15:59:41 +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
Laurent Destailleur
4c0fcb2b9a Fix total with tax does not include local taxes. To solve, i show both
totals.
2017-07-07 14:58:57 +02:00
Laurent Destailleur
8abec461a6 Fix total with tax does not include local taxes. To solve, i show both
totals.
2017-07-07 12:31:00 +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
024c6d2c08 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-07 11:36:24 +02:00
Laurent Destailleur
2be9f402c6 Fix order of tab 2017-07-07 10:58:18 +02:00
Laurent Destailleur
de1a7042d4 Fix filter on list of actions 2017-07-07 10:55:42 +02:00
Laurent Destailleur
9baeee893f Fix multicurrency (tags for odt) 2017-07-07 10:54:54 +02:00
Laurent Destailleur
2aaf8b22f2 Fix substitution var 2017-07-07 10:10:12 +02:00
Alexandre SPANGARO
0797323664 Fix: Search broken in holiday list 2017-07-07 06:42:29 +02:00
Alexandre SPANGARO
d5d2b3a2fc Merge remote-tracking branch 'uptream/develop' into 6.0-fec3 2017-07-07 06:10:56 +02:00
Alexandre SPANGARO
0c5febfb4d Fix: Accountancy 2017-07-07 06:09:49 +02:00
fappels
6effcb0829 New add trigger disable to updateline functions 2017-07-06 16:26:15 +02:00
fappels
857e45baf3 Fix comment 2017-07-06 15:34:10 +02:00
jfefe
a072b23a5e FIX #7075 : bad path for document 2017-07-06 00:47:26 +02:00
alexis Algoud
3d18c71201 FIX invoice situation VAT total rounding into PDF crabe 2017-07-05 17:21:37 +02:00
arnaud
1a71e9b4a0 FIX add supplierproposaldet without price (new product) 2017-07-05 16:57:03 +02:00
phf
31b94c1d3f Fix 7109 - class name already exist for customer payment 2017-07-05 16:52:37 +02:00
Regis Houssin
c5442c3553 Fix: module "root" not exists ! (deprecated api) 2017-07-05 12:21:35 +02:00
florian HENRY
a4b1c28696 fix : accountancy right management 2017-07-05 11:33:58 +02:00
florian HENRY
1816b2249e fix class error 2017-07-05 11:24:24 +02:00
Regis Houssin
a2e2149eb2 Fix: multiple preg_match $reg confusion ! 2017-07-05 11:12:48 +02:00
florian HENRY
437b2a7290 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2017-07-05 11:01:57 +02:00
Laurent Destailleur
e7e4252244 Fix deletion of category 2017-07-05 01:23:42 +02:00
Laurent Destailleur
e199864fce Better log 2017-07-05 00:09:35 +02:00
TuxGasy
5b154946a8 fix missing error on stock mouvment with batch 2017-07-04 21:48:38 +02:00
TuxGasy
9f50882d6d fix incorrect indent 2017-07-04 21:45:38 +02:00
Laurent Destailleur
ea8a49aea3 Prepare 5.0.5 2017-07-04 17:38:20 +02:00
Laurent Destailleur
451e8fc024 FIX Support of vat code when using price per customer 2017-07-04 17:37:28 +02:00
Laurent Destailleur
c1e747fa39 Look and feel v6 2017-07-04 13:05:02 +02:00
phf
3892da7606 Fix update row on xlsx import do not work as csv import 2017-07-04 12:09:56 +02:00
Laurent Destailleur
77f5952318 Fix pgsql compatibility 2017-07-04 11:18:48 +02:00
Laurent Destailleur
95cf36c43b Fix use the getUrl function instead of hard coded curl 2017-07-04 10:55:53 +02:00
John
e1ae97e661 Fix return method 2017-07-04 10:34:59 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
phf
42183877e8 Fix sql syntax 2017-07-04 09:30:53 +02:00
Regis Houssin
d9d9b748ad Fix: check if action type is different of 'user' (external module) 2017-07-03 19:27:21 +02:00
florian HENRY
7f869b4840 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/accountancy/class/accountancycategory.class.php
2017-07-03 14:36:50 +02:00
TuxGasy
c8d039508f Fix missing error message 2017-07-03 14:01:11 +02:00
Laurent Destailleur
cb1c461b69 Work on module builder 2017-07-03 12:28:52 +02:00
Laurent Destailleur
8b91f4fb5e Debug module website 2017-07-03 12:04:45 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
db1d97c9ac Fix bad value for ref of old contracts 2017-07-03 02:09:14 +02:00
Laurent Destailleur
8a96260892 Fix amount not filled into email confirmation 2017-07-03 01:57:28 +02:00
Laurent Destailleur
d57fe35efc Add option to fix corrupted database with bad pagecode 2017-07-03 01:36:04 +02:00
Laurent Destailleur
aa1351d483 Fix to be sure database is not created using utf8mb4 (not yet supported) 2017-07-03 01:10:09 +02:00
Laurent Destailleur
efecb32ec9 Fix migration 2017-07-03 00:11:22 +02:00
Laurent Destailleur
565de9bc8d Debug module website 2017-07-02 23:38:19 +02:00
Laurent Destailleur
b95dea3b50 Fix missing ; 2017-07-02 23:37:52 +02:00
Laurent Destailleur
c56ea50251 Currency symbol for peru is before value 2017-07-02 14:30:24 +02:00
Laurent Destailleur
4f72bd35db Fix too much code into the NOREQUIREDB 2017-07-02 13:18:23 +02:00
Laurent Destailleur
53708c138a Add option to be able to debug problem of apache lock page 2017-07-01 16:52:28 +02:00
Laurent Destailleur
a5cfd7c2e2 FIX Error when updating thirdparty not returned 2017-07-01 16:24:33 +02:00
Laurent Destailleur
c5aed0c333 Fix phpcs 2017-07-01 14:25:46 +02:00
Laurent Destailleur
7ae52d843c Look and feel v6 2017-07-01 14:23:24 +02:00
Laurent Destailleur
b186fa8759 Fix pgsql compatibility 2017-07-01 13:31:44 +02:00
Laurent Destailleur
658fe93d8c Fix menu editor (data not aligned) 2017-07-01 12:42:49 +02:00
Laurent Destailleur
b7218c1bcd Fix menu consistency 2017-07-01 03:18:17 +02:00
Laurent Destailleur
31fe8ebcee Debug v6 2017-07-01 02:22:08 +02:00
Laurent Destailleur
2b0b2096f6 Fix test on mandatory field 2017-06-30 22:40:08 +02:00
Laurent Destailleur
727085f3ec Fix missing migration column zip 2017-06-30 19:01:49 +02:00
Laurent Destailleur
b308cfef1d Fix dol_trunc 2017-06-30 18:30:01 +02:00
fappels
78283b6a0b Ignore rights filter for virtual stock calculation. 2017-06-30 17:02:50 +02:00
Darkjeff
180467ba56 add lettering 2017-06-30 11:53:15 +02:00
Darkjeff
32729adfae Journal correct negatif amount 2017-06-30 11:49:03 +02:00
Laurent Destailleur
d55213286e Fix missing parameter 2017-06-30 11:40:26 +02:00
Darkjeff
f978b0795a Fix action in journal 2017-06-30 11:31:24 +02:00
Darkjeff
2c795da664 Fix Binding Supplier 2017-06-30 11:30:20 +02:00
Darkjeff
11cd4e1164 Fix Binding Customer 2017-06-30 11:29:37 +02:00
Laurent Destailleur
ea504a0516 FIX We should be able to insert data with value '0' into const 2017-06-30 11:10:05 +02:00
fappels
989084e4de WAP always 2 decimals 2017-06-30 10:56:05 +02:00
fappels
574590a598 Add minimum qty column 2017-06-30 10:55:45 +02:00
fappels
d0599cd952 Revert "WAP alway decimal 2 digits"
This reverts commit 7d4a093d9e.
2017-06-30 10:54:04 +02:00
fappels
7d4a093d9e WAP alway decimal 2 digits 2017-06-30 10:52:54 +02:00
arnaud
ca6ce2ba8b FIX status were wrong on product referent list 2017-06-30 10:38:54 +02:00
arnaud
f79b72f724 FIX edit sociale was emptying label 2017-06-29 16:57:30 +02:00
KHELIFA
62f8aa8b40 Fix: In supplier order, show link Now for order date and delivery date 2017-06-29 16:49:30 +02:00
KHELIFA
7dc4eeddf0 FIX: Function load_board in commande.class.php for warnings delay in dashboard 2017-06-29 16:44:52 +02:00
florian HENRY
7556a604e3 fix travis 2017-06-29 16:30:57 +02:00
Laurent Destailleur
f7ba3ddc07 Fix translation 2017-06-29 15:59:46 +02:00
florian HENRY
6e8c83b2a9 fix class error (given by eclipse Oxygen version) 2017-06-29 15:47:33 +02:00
Laurent Destailleur
e8b33e3dba To provide solution to get thirdparty when name is not unique.
Conflicts:
	htdocs/societe/class/societe.class.php
2017-06-29 15:38:39 +02:00
arnaud
9da9dff3c3 Merge branch '5.0' of github.com:Dolibarr/dolibarr into FIX_holidays_postgresql 2017-06-29 14:37:03 +02:00
arnaud
a695fa9c6e FIX holidays with postgresql like on rowid integer 2017-06-29 14:36:10 +02:00
Laurent Destailleur
ab0a730d4a Fix bad GETPOST on 'action' 2017-06-29 02:54:56 +02:00
Laurent Destailleur
e9f9b5bdf4 Merge pull request #7069 from Darkjeff/develop
Accountancy update
2017-06-29 02:49:35 +02:00
Laurent Destailleur
724392a557 Merge pull request #7073 from fmarcet/3.9
FIX: User id correction on holiday request
2017-06-29 02:45:53 +02:00
BENKE Charlene
b17937ce0d Error fields and add date end on rapport pdf
percentage instead percent
2017-06-28 21:29:01 +02:00
Laurent Destailleur
05318bb4ec More complete dol_string_nospecial 2017-06-28 19:02:09 +02:00
fmarcet
4283b1ee30 FIX: User id correction on holiday request 2017-06-28 18:31:37 +02:00
Laurent Destailleur
b6002bd1f8 Fix bad link 2017-06-28 18:29:57 +02:00
Darkjeff
0955b355e9 update result 2017-06-28 16:50:29 +02:00
Darkjeff
ef5e38b0d3 correct bug result 2017-06-28 16:45:44 +02:00
Darkjeff
97da70e583 bug lines supplier 2017-06-28 16:38:06 +02:00
Darkjeff
8182f5fb2a update journal and supplier lines 2017-06-28 16:35:14 +02:00
Maxime Kohlhaas
cef5c0b375 Fix column position in PDF when VAT is hidden 2017-06-28 00:38:24 +02:00
Maxime Kohlhaas
3664956b8c Update pdf_azur.modules.php 2017-06-28 00:31:33 +02:00
Laurent Destailleur
22fabe5a3a Copyright in modulebuilder 2017-06-27 20:14:48 +02:00
Laurent Destailleur
7e6e0ee3a4 Fix link to image of MD files 2017-06-27 20:02:46 +02:00
Laurent Destailleur
2f9cc1c919 Fix avoid errors with postgresql 2017-06-27 18:35:10 +02:00
Laurent Destailleur
d186aed96c Fix: date must be stored into a date field (error with pgsql).
import_key is reserved for "import" process.
2017-06-27 18:26:17 +02:00
Laurent Destailleur
5dd8d1c4ef Rename button to make clear for user that the export is not the real
journal but a temporary situation.
2017-06-27 17:56:45 +02:00
Laurent Destailleur
9c64ba6ad6 Fix closing } 2017-06-27 17:52:50 +02:00
Laurent Destailleur
aa2ea621c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 17:42:19 +02:00
Laurent Destailleur
adf281c4f3 Look and feel v6 2017-06-27 17:42:07 +02:00
Laurent Destailleur
ba30f80a03 Merge pull request #7062 from Darkjeff/develop
Update Accountancy Journals
2017-06-27 17:41:22 +02:00
Laurent Destailleur
5f00fb5df8 Merge pull request #7059 from jfefe/patch-13
Add missing end tag `form` into fichinter setup
2017-06-27 17:36:33 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
c213624c14 Fix migration into product_lot 2017-06-27 16:42:37 +02:00
Laurent Destailleur
1a860c42ee Look and feel v6 2017-06-27 16:42:11 +02:00
Laurent Destailleur
50bf1bb21f Fix error in count of qty in other shipments 2017-06-27 16:41:57 +02:00
arnaud
65b9b70ff8 FIX invoice page list 2017-06-27 15:23:51 +02:00
Laurent Destailleur
77ba5a8c24 Fix reception of product interface 2017-06-27 14:02:01 +02:00
Darkjeff
cb0e7b200e Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2017-06-27 12:45:56 +02:00
Laurent Destailleur
1fafa4017d Fix test on currency name 2017-06-27 12:33:29 +02:00
Darkjeff
8146049b4d update bank journal
add in bookkeeping
add export control
correct some bug with salary
2017-06-27 12:12:25 +02:00
Laurent Destailleur
3b7667292b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-27 11:59:40 +02:00
Darkjeff
618334ac42 update purchase journal
add in bookkeeping
add export control
2017-06-27 11:58:26 +02:00
Darkjeff
2e64db2556 update sells journal
add in bookkeeping
add export control
2017-06-27 11:44:18 +02:00
Laurent Destailleur
10eda66735 Fix alignement 2017-06-27 11:32:52 +02:00
Laurent Destailleur
92287ab18d Fix url suggested for bookmark did not always include params 2017-06-27 11:12:03 +02:00
Laurent Destailleur
08af9bf365 List before 2017-06-27 10:37:00 +02:00
Laurent Destailleur
267170b8d2 Fix mainmenu was not correctly set with auguria menu 2017-06-27 10:34:41 +02:00
Laurent Destailleur
34f3552dc7 Fix missing image of user 2017-06-27 04:31:29 +02:00
Laurent Destailleur
3fdfebf7ef Fix position of top menu does not follow 'position' field. 2017-06-27 04:25:41 +02:00
fappels
e3f7402e07 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list 2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a Create patch
Add Number of supplier prices and wap columns
2017-06-26 22:44:56 +02:00
jfefe
9b951c5d1b Add missing end tag form into fichinter setup
The setup for option `FICHINTER_PRINT_PRODUCTS` was broken.
2017-06-26 21:37:36 +02:00
John
93477c102f FIX delete linked element on facture rec 2017-06-26 15:44:04 +02:00
Laurent Destailleur
75006f9970 Fix data 2017-06-26 13:30:14 +02:00
Laurent Destailleur
3a6314b1a0 Fix data 2017-06-26 13:29:18 +02:00
Laurent Destailleur
2be848025f Fix parameter withcode of currency_name function. Add PHPUnit tests 2017-06-26 10:09:22 +02:00
Laurent Destailleur
4a21457b8a Fix position of page nb 2017-06-26 09:28:02 +02:00
Laurent Destailleur
85ce1f3332 Fix missing var init 2017-06-26 09:20:16 +02:00
Laurent Destailleur
0b7c768f29 FIX Usage of production mode with REST Api. 2017-06-25 18:18:17 +02:00
Laurent Destailleur
63dcdc3a03 Fix API was loading definition of all APIs at each call. 2017-06-25 17:09:08 +02:00
Laurent Destailleur
025db4ac97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-25 12:26:32 +02:00
Laurent Destailleur
8bfda8d4ee Code comment 2017-06-25 12:26:16 +02:00
Laurent Destailleur
e97a4d953d Merge pull request #7052 from hidupcloud/develop
FIX Fixing pages warning when value is null
2017-06-25 03:03:34 +02:00
Laurent Destailleur
059e361bd8 Merge pull request #7053 from defrance/patch-15
FIX $forceimgscaleheight instead $forceimgscalewidth
2017-06-25 03:01:53 +02:00
Laurent Destailleur
78ebffe4f1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/install/fileconf.php
2017-06-25 02:31:38 +02:00
Laurent Destailleur
6298436a1b Clean old lot numbers 2017-06-25 02:26:30 +02:00
Laurent Destailleur
778e581aca Fix: avoid warning on permission if there is only admin users 2017-06-24 22:14:04 +02:00
Laurent Destailleur
ab9be29356 Fix installers 2017-06-24 21:36:51 +02:00
BENKE Charlene
03cb850442 $forceimgscaleheight instead $forceimgscalewidth 2017-06-24 20:48:11 +02:00
Laurent Destailleur
bd4f91d7eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-24 16:57:54 +02:00
Laurent Destailleur
fed5999a6c Update doc 2017-06-24 16:57:42 +02:00
Juan Bautista Mesa Roldán
0f5dc90bae Fixing pages warning when value is null 2017-06-24 16:45:45 +02:00
Laurent Destailleur
30e881b03a Merge pull request #7051 from aspangaro/6.0-fec3
Fix : Accountancy v6
2017-06-24 16:34:28 +02:00
Laurent Destailleur
534ec0d44a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/bankentries.php
2017-06-24 16:26:29 +02:00
Laurent Destailleur
e79f3715b4 FIX #7048 #6075 2017-06-24 16:21:25 +02:00
Laurent Destailleur
b0c5616ff0 Fix in the way markdown README and ChangeLog are output on module page. 2017-06-24 16:01:18 +02:00
Laurent Destailleur
1eee7297dc Fix typo 2017-06-24 12:56:55 +02:00
Laurent Destailleur
509aad9bce Fix README 2017-06-24 12:52:39 +02:00
Laurent Destailleur
3b2eb97d72 Fix menu position 2017-06-24 10:29:07 +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
ee8924e101 Fix position of accounting periods 2017-06-24 10:23:38 +02:00
Laurent Destailleur
ba82bc39c8 Fix missing alias 2017-06-24 00:25:29 +02:00
Laurent Destailleur
81a473d547 Warning not required for the moment 2017-06-23 23:40:02 +02:00
Laurent Destailleur
d2fd4d6978 Better path to laod main.inc.php 2017-06-23 23:36:25 +02:00
Laurent Destailleur
247803f894 Better templates 2017-06-23 20:03:15 +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
45004493e0 Fix multicurrency and vat_src_code not propaged on invoice from
shipment.
2017-06-23 11:12:17 +02:00
Laurent Destailleur
a05bbd651c Fix translation 2017-06-23 11:09:29 +02:00
Laurent Destailleur
ecae2fc6b6 Fix translation 2017-06-23 11:08:49 +02:00
Laurent Destailleur
3a400c46ad Fix preselected email not done 2017-06-23 10:15:32 +02:00
Laurent Destailleur
c89e2eb7ea Fix pagination 2017-06-22 15:31:07 +02:00
Laurent Destailleur
5ed8340d0e Fix no record found into lists 2017-06-22 15:22:44 +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
0fd1308f93 Add force_disable_of_modules_not_found to clean database and removed
false warning when modules files were removed with disabling it before
2017-06-22 14:06:48 +02:00
Laurent Destailleur
474a2692fa Fix missing /div 2017-06-22 13:54:03 +02:00
Laurent Destailleur
c7a6a67e20 Fix remove warnings 2017-06-22 11:04:29 +02:00
Laurent Destailleur
64eef9f89c Fix compatibility with pgsql 2017-06-22 11:04:15 +02:00
Laurent Destailleur
06c7cb5d8c Fix css 2017-06-22 09:21:32 +02:00
Alexandre SPANGARO
459fac4753 Merge remote-tracking branch 'uptream/develop' into 6.0-fec3
# Conflicts:
#	htdocs/accountancy/customer/index.php
2017-06-22 05:30:21 +02:00
Laurent Destailleur
a6f3eabf4d example of FK definition 2017-06-21 19:26:36 +02:00
Laurent Destailleur
014cb4b004 Fix navigation on security event list 2017-06-21 12:03:49 +02:00
Laurent Destailleur
4102403482 Look and feel v6 2017-06-21 11:37:34 +02:00
Laurent Destailleur
9ec7929753 Look and feel v6 2017-06-21 10:59:39 +02:00
Laurent Destailleur
ce8a024d44 Fix limit on margin pages 2017-06-21 00:34:56 +02:00
Laurent Destailleur
ec9bbe2b52 Help/Need debug of some online instances with the log view 2017-06-20 16:54:37 +02:00
Laurent Destailleur
3873bc7433 Fix bette compatibility with pgsql 2017-06-20 15:06:24 +02:00
Laurent Destailleur
302e086f99 Fix pgsql compatibility 2017-06-20 13:33:26 +02:00
Laurent Destailleur
f1701469e0 NEW data files are now also parsed by phpunit for sql syntax 2017-06-20 13:28:34 +02:00
Laurent Destailleur
efe5d79a86 Work on #6958. Only one type of invoice supported for supplier invoices 2017-06-20 12:58:43 +02:00
Laurent Destailleur
4dda771079 FIX #6973 2017-06-20 12:54:26 +02:00
Laurent Destailleur
3ec0e6f7ef FIX #6885 2017-06-20 12:31:08 +02:00
Laurent Destailleur
08a86fa03d Start #6981 2017-06-20 12:17:13 +02:00
Laurent Destailleur
f2a2cfd8c8 Look and feel v6 2017-06-20 11:46:30 +02:00
Laurent Destailleur
a7fb411a42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-20 10:46:38 +02:00
Laurent Destailleur
d572bd4f34 FIX #7003 2017-06-20 10:45:20 +02:00
Laurent Destailleur
6d42922839 FIX #7012 2017-06-20 10:37:42 +02:00
Laurent Destailleur
d8b0199ba2 FIX #7040 2017-06-20 10:24:54 +02:00
Laurent Destailleur
095155a58b Enhance sql quality. Refused double quotes into sql content. 2017-06-20 10:06:17 +02:00
Alexandre SPANGARO
c381c213a5 Fix : Accountancy 2017-06-20 06:52:41 +02:00
Laurent Destailleur
74c509eac8 Fix bad var type (must be array) 2017-06-20 02:36:13 +02:00
Laurent Destailleur
658ba50aa8 Standardize picto status 2017-06-20 02:29:29 +02:00
Laurent Destailleur
8d23ffd6d2 Fix show vat rates 2017-06-20 02:05:42 +02:00
Laurent Destailleur
fcdc7b1a0d Fix pgsql compatibility 2017-06-20 01:53:34 +02:00
Laurent Destailleur
d78d5d60c4 Fix pgsql
Fix missing vat rate info.
2017-06-20 01:45:44 +02:00
Laurent Destailleur
ef4a527ff0 Merge pull request #7044 from aspangaro/6.0-fec3
Fix : Accountancy - Debug
2017-06-20 01:18:45 +02:00
Laurent Destailleur
dbeb31cad3 Merge pull request #7039 from marcosgdf/bug-5640
FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances
2017-06-20 01:15:33 +02:00
Laurent Destailleur
1f83bef1b5 Merge pull request #7035 from fmarcet/3.9
Fix: User id correction on holiday request
2017-06-20 00:57:10 +02:00
Laurent Destailleur
eef5df583e Fix php 7.2 2017-06-20 00:50:30 +02:00
Laurent Destailleur
3717a01641 Fix lang 2017-06-19 23:15:47 +02:00
Laurent Destailleur
8dffc38cd5 Fix separator 2017-06-19 21:46:38 +02:00
Alexandre SPANGARO
95573e8608 Fix : Accountancy - Debug 2017-06-19 21:39:43 +02:00
Laurent Destailleur
504d376f84 Sync transifex 2017-06-19 21:34:33 +02:00
Laurent Destailleur
de423e531c Sync nb_NO 2017-06-19 21:24:55 +02:00
Laurent Destailleur
2695cc416e Fix comment 2017-06-19 21:06:16 +02:00
Laurent Destailleur
24f7128742 Fix pb with postgresql 2017-06-19 21:04:46 +02:00
Laurent Destailleur
64d8b97afe Fix sql syntax errors 2017-06-19 20:35:14 +02:00
Laurent Destailleur
099ef585b2 Fix pgsql 2017-06-19 20:07:33 +02:00
Laurent Destailleur
1745d06bb7 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 19:56:16 +02:00
Laurent Destailleur
12d7b92556 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 19:52:49 +02:00
Laurent Destailleur
bdeddd3617 Fix pgsql migration 2017-06-19 19:48:19 +02:00
Laurent Destailleur
6fb0fc7b71 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 19:42:56 +02:00
Laurent Destailleur
f694939fc7 Fix migration with pgsql 2017-06-19 19:39:37 +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
Laurent Destailleur
3c73b426d7 Fix migration. Must make reload only on last version step. 2017-06-19 18:32:18 +02:00
Marcos García
ba87549124 FIX #5640 Prices of a predefined product/service were incorrect under certain circumstances 2017-06-19 18:07:43 +02:00
fmarcet
c4546b6da6 FIX: User id correction on holiday request 2017-06-19 16:23:44 +02:00
Laurent Destailleur
6fe96b322a Fix PHPCS 2017-06-19 16:18:07 +02:00
Laurent Destailleur
6fdc279fd3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 15:38:01 +02:00
Laurent Destailleur
8f6e756249 Fix PHPCS 2017-06-19 15:37:22 +02:00
Laurent Destailleur
c775e2530a Merge pull request #7025 from hregis/develop_bug_restapi
New: add extrafields API REST
2017-06-19 15:21:48 +02:00
Laurent Destailleur
8595cbc16d Merge pull request #7034 from inoveaconseil/patch-6
Add import fields for societe rib
2017-06-19 15:12:53 +02:00
Laurent Destailleur
43b97f02c3 Merge pull request #7033 from hregis/develop_bug2
Fix: for avoid warning
2017-06-19 15:11:49 +02:00
Laurent Destailleur
c8b4ab87cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 15:08:10 +02:00
Laurent Destailleur
241ec01adf FIX #7031 missing change column "state_id" since dolibarr 3.5 !! 2017-06-19 15:07:55 +02:00
Laurent Destailleur
cffb368bbd Merge pull request #7030 from aspangaro/6.0-fec3
Fix : Accountancy - Debug and add information in database
2017-06-19 15:02:30 +02:00
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Laurent Destailleur
287e727e71 Fix detection of relative URL 2017-06-19 13:47:25 +02:00
Laurent Destailleur
a2ca6d5ef9 Add warning in log if conf file setup not correct 2017-06-19 12:50:13 +02:00
Ferran Marcet
03eadcebf1 FIX: User id correction on holiday request 2017-06-19 12:25:00 +02:00
Inovea Conseil
85efe6ef74 Add import fields for societe rib
Add import fields for rib account, this fields are used in a new external module bankwire for supplier invoice.

But we must copy the translation of banks.lang in bills.lang are there an other solution  ?
2017-06-19 11:32:11 +02:00
Regis Houssin
d2371946ba Fix: for avoid warning 2017-06-19 09:50:13 +02:00
Regis Houssin
9352ecca1f Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2017-06-19 04:01:34 +02:00
Laurent Destailleur
caf48f32c4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 03:01:01 +02:00
Laurent Destailleur
43f25b49a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 02:58:44 +02:00
Laurent Destailleur
52eeeebac9 Fix bad data in sql dump 2017-06-19 02:57:49 +02:00
Laurent Destailleur
5439390461 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42 Fix migration opensurvey 2017-06-19 02:55:33 +02:00
Laurent Destailleur
8d84277e8c Complete repair script 2017-06-19 02:18:04 +02:00
Laurent Destailleur
a1f08be479 Fix phpcs 2017-06-18 22:21:42 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00
Laurent Destailleur
996ec4926b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/lib/files.lib.php
	htdocs/don/card.php
2017-06-18 22:16:34 +02:00
Alexandre SPANGARO
a4de12dd8d Merge remote-tracking branch 'uptream/develop' into 6.0-fec3 2017-06-18 22:15:36 +02:00
Laurent Destailleur
317ab64d7c Fix escapement 2017-06-18 22:03:25 +02:00
Laurent Destailleur
f3a5975cf8 Fix sql injection 2017-06-18 21:58:56 +02:00
Laurent Destailleur
8debefa8ad Fix php sanitazing 2017-06-18 21:53:06 +02:00
Laurent Destailleur
0ef507ae7f Fix rename of file to remove .noexe extension. 2017-06-18 21:52:51 +02:00
Laurent Destailleur
819656bd89 Fix security: Check _SERVER["QUERY_STRING"] is escaped. 2017-06-18 21:27:49 +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
Laurent Destailleur
cde0da6e12 Fix responsive 2017-06-18 12:48:58 +02:00
Laurent Destailleur
787d6946b2 Continue work started on module builder 2017-06-18 12:30:18 +02:00
Laurent Destailleur
862b12abfd Fix responsive 2017-06-17 21:28:29 +02:00
Laurent Destailleur
69b26dcb4e Work on modulebuilder 2017-06-17 21:23:52 +02:00
Laurent Destailleur
a6b4b15e07 Work on modulebuilder 2017-06-17 19:40:48 +02:00
Regis Houssin
fd9c30fd11 Revert "Fix: wrong array format"
This reverts commit 48866f0732.
2017-06-17 18:30:11 +02:00
Regis Houssin
88df5b6857 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi 2017-06-17 18:29:38 +02:00
Laurent Destailleur
9a04208150 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-17 18:04:04 +02:00
Laurent Destailleur
0482137620 Fix warning 2017-06-17 18:03:53 +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
Laurent Destailleur
af3e505587 Merge pull request #7022 from hregis/develop_mc
Fix: missing hookmanager init
2017-06-17 17:49:46 +02:00
Laurent Destailleur
60b278ac39 Merge pull request #7021 from Dolibarr/revert-7020-7.0-1
Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values"
2017-06-17 17:48:37 +02:00
BENKE Charlene
fcdf68db6a Update commonobject.class.php 2017-06-17 16:31:54 +02:00
BENKE Charlene
db17363267 Update other.lang 2017-06-17 16:30:37 +02:00
BENKE Charlene
12cab2dfe0 Once to Ounce 2017-06-17 16:30:03 +02:00
Regis Houssin
48866f0732 Fix: wrong array format 2017-06-17 14:44:56 +02:00
Regis Houssin
240e9637fa New: add extrafields API REST 2017-06-17 14:43:15 +02:00
Regis Houssin
d1b003f3c4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-17 12:01:14 +02:00
Laurent Destailleur
8a1de52f3c Fix translation 2017-06-17 12:00:33 +02:00
Laurent Destailleur
a4f34539ea Fix translation 2017-06-17 11:46:45 +02:00
Laurent Destailleur
7c41c9a3e4 Fix activation of dependency for a dedicated country.
BlockedLog depends now on CashDesk only.
2017-06-17 11:43:00 +02:00
Laurent Destailleur
bebe7baa80 Fix images into medias not reabable into send emails 2017-06-17 10:44:08 +02:00
Regis Houssin
49e8af7cc9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-17 10:34:50 +02:00
BENKE Charlene
f0bc72cda4 WeightUnitonce translation 2017-06-17 10:27:00 +02:00
BENKE Charlene
17247c64f0 add WeightUnitonce 2017-06-17 10:26:01 +02:00
BENKE Charlene
e98bc90489 introduce OZ : once weight 2017-06-17 10:18:59 +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
Alexandre SPANGARO
b240f536b5 Fix : Accountancy - Debug and add information in database 2017-06-17 07:54:35 +02:00
Laurent Destailleur
1d91ce90d3 FIX image from medias directory into PDF free text 2017-06-17 00:16:22 +02:00
Regis Houssin
f0e234eef2 Fix: missing hookmanager init 2017-06-16 17:01:43 +02:00
Laurent Destailleur
b228fe6a2a Fix auto focus on module page 2017-06-16 16:06:20 +02:00
Laurent Destailleur
81f1a34112 Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values" 2017-06-16 13:06:35 +02:00
Laurent Destailleur
549bb2c55f Merge pull request #7020 from aspangaro/7.0-1
Fix SPEC #7013 : use database type "numeric" to store monetary values
2017-06-16 12:59:52 +02:00
Laurent Destailleur
e813fd2dfa Fix missing key import_key and extraparams 2017-06-16 12:57:30 +02:00
Laurent Destailleur
5a477bdd6d Merge pull request #7018 from hregis/develop_bug_restapi
Fix: missing _cleanObjectDatas function
2017-06-16 12:53:11 +02:00
Laurent Destailleur
492ee135ba Merge pull request #7011 from hregis/develop_bug3
Fix: error when the project module not enabled
2017-06-16 12:51:28 +02:00
Laurent Destailleur
7777bcc587 Merge pull request #7009 from atm-ph/fix_5.0_css_situation_invoice
Fix css to apply "pair" and "impair" style
2017-06-16 12:50:44 +02:00
Laurent Destailleur
1c8daf9700 Standardize and debug code of module BlockedLog 2017-06-16 12:46:15 +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
Regis Houssin
c2901ae8cd Fix: add/remove unset unsused fields 2017-06-16 11:01:58 +02:00
Regis Houssin
c656856ec2 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug_restapi 2017-06-16 10:52:43 +02:00
Alexandre SPANGARO
f424f96589 Fix SPEC #7013 : use database type "numeric" to store monetary values 2017-06-16 05:15:00 +02:00
Laurent Destailleur
b416b22bcc Fix phpcs 2017-06-16 01:27:28 +02:00
Laurent Destailleur
b1945daf6c Fix alignement 2017-06-16 01:07:44 +02:00
Laurent Destailleur
07b676792a Fix do not show localtax info if not used. 2017-06-16 01:02:53 +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
8149bf62a8 Fix ajaxcombo broken on accouting account edition on vat dictionary. 2017-06-15 23:47:19 +02:00
Regis Houssin
9410466d72 Fix: better check and security 2017-06-15 21:51:31 +02:00
Laurent Destailleur
8b7ca1f280 Fix missing vat_src_code into table of expense report 2017-06-15 21:27:20 +02:00
Regis Houssin
78d5520741 Fix: missing _cleanObjectDatas function 2017-06-15 21:23:35 +02:00
Laurent Destailleur
f39fb5187a Fix component to select journal 2017-06-15 20:27:40 +02:00
Laurent Destailleur
097be322a6 Modify code to match new v6 structure. 2017-06-15 19:29:00 +02:00
Laurent Destailleur
4009b1837c Fix permissions 2017-06-15 11:17:02 +02:00
phf
3333049341 Fix total aren't aligned 2017-06-15 11:11:49 +02:00
Laurent Destailleur
71c0be20b9 Change data structure for bookkeeping v6 2017-06-15 10:30:32 +02:00
Regis Houssin
8eb3f3bc06 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug3 2017-06-14 12:13:23 +02:00
Laurent Destailleur
0b6d7a5b57 Modulebuilder 2017-06-14 12:05:47 +02:00
Laurent Destailleur
ce9e1dfb98 Fix tag non closed 2017-06-14 11:37:04 +02:00
Laurent Destailleur
faabdd3f99 Missing filter field 2017-06-14 11:34:35 +02:00
Laurent Destailleur
1b56e4a01c Fix look and feel v6 2017-06-14 11:28:42 +02:00
Laurent Destailleur
00bf4bba13 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/user/index.php
2017-06-14 10:54:34 +02:00
Laurent Destailleur
b8dd7fb958 Fix phpcs 2017-06-14 10:53:04 +02:00
Laurent Destailleur
2d571bf097 Fix bad merge 2017-06-14 10:50:43 +02:00
Laurent Destailleur
b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
2017-06-14 10:48:34 +02:00
Laurent Destailleur
848f70e026 Fix bad merge 2017-06-14 10:38:34 +02:00
Laurent Destailleur
0e867229db FIX Can't create invoice if PO disapproved 2017-06-14 10:28:02 +02:00
Laurent Destailleur
7939daa225 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/index.php
2017-06-14 10:18:24 +02:00
Laurent Destailleur
83a5b8e078 FIX Can set supplier invoice to billed. 2017-06-14 10:13:33 +02:00
phf
d2db5f60a8 Fix css to apply "pair" and "impair" style 2017-06-14 09:42:05 +02:00
Regis Houssin
50aa40da3b Fix: error when the project module not enabled 2017-06-14 07:40:11 +02:00
Laurent Destailleur
a88bafe198 Fix responsive 2017-06-13 20:07:28 +02:00
Laurent Destailleur
fc5dfcda65 Fix error management in POS. 2017-06-13 19:46:27 +02:00
Laurent Destailleur
c088ccea32 Fix better management of export of extrafield computed. 2017-06-13 18:50:31 +02:00
Laurent Destailleur
fd2ab6371d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-13 15:58:22 +02:00
Laurent Destailleur
70c7bcc85f Complete css to get value unique 2017-06-13 15:57:30 +02:00
alexis Algoud
ef0907d89e NEW log download or preview event on a validate bill 2017-06-13 15:55:22 +02:00
Laurent Destailleur
c8856182a6 Fix look and feel v6 2017-06-13 15:34:18 +02:00
Laurent Destailleur
7b8a35630c Merge pull request #6997 from atm-ph/fix_6993
Fix 6993 - supplier propal check min price on update line
2017-06-13 15:03:27 +02:00
Laurent Destailleur
9e5af63c2c Merge pull request #6996 from atm-ph/fix_5.0_display_situtation_amount
Fix display on situation invoice
2017-06-13 15:01:44 +02:00
Laurent Destailleur
9f3e35ef85 Merge pull request #6995 from atm-ph/fix_develop_search_product
Fix ajax search product is broken
2017-06-13 15:01:18 +02:00
Laurent Destailleur
1519d0eb95 Merge pull request #6994 from atm-alexis/NEW_blocklog_develop_refactor
NEW blocklog view, export and fix
2017-06-13 15:00:47 +02:00
Laurent Destailleur
9b979e3cb7 Fix wrong warning when user is disabled 2017-06-13 13:44:18 +02:00
Laurent Destailleur
c0f46834cb Fix demo links 2017-06-13 13:22:05 +02:00
phf
f2961b8652 Fix 6993 - supplier propal check min price on update line 2017-06-13 12:30:30 +02:00
Laurent Destailleur
e4c7f584e3 Fix option STOCK_SUPPORTS_SERVICES (stock not visible when it should) 2017-06-13 11:45:21 +02:00
phf
4c0b0ef4c2 Fix display on situation invoice 2017-06-13 11:29:12 +02:00
Laurent Destailleur
5def2d2600 Add div to help debug of html content 2017-06-13 11:14:52 +02:00
Laurent Destailleur
225c17d047 Fix permission on menu entry 2017-06-13 11:06:57 +02:00
Laurent Destailleur
ffdee40eb9 Fix permission on recurring invoice list 2017-06-13 10:58:41 +02:00
phf
b67a14c7d6 Fix ajax search product is broken 2017-06-13 10:20:26 +02:00
alexis Algoud
4c424bb760 fix current element compare amount 2017-06-13 10:09:53 +02:00
alexis Algoud
f780af305a NEW blocklog other things
fix minor
add view only for error
add download log as csv
add record event on bill send by mail event
2017-06-13 10:04:05 +02:00
Laurent Destailleur
3f064769ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-12 18:23:06 +02:00
Laurent Destailleur
ba3a74576c Merge 5.0 2017-06-12 18:22:51 +02:00
Laurent Destailleur
4402c7fb89 Merge pull request #6987 from atm-ph/fix_6962
FIX 6962 Can't create shipment if no write permission on order
2017-06-12 17:46:29 +02:00
Laurent Destailleur
ecf29332f3 Merge pull request #6989 from atm-alexis/NEW_blocklog_develop_refactor
NEW Blokedlog stuff
2017-06-12 17:44:27 +02:00
florian HENRY
71afaaa360 fix : availibity refresh 2017-06-12 17:24:36 +02:00
Laurent Destailleur
64a6ff9687 Fix test for navigation disabling for external users 2017-06-12 16:26:25 +02:00
Laurent Destailleur
b52971d0a2 Fix template 2017-06-12 16:00:38 +02:00
Laurent Destailleur
5d9a84dedb Fix sql syntax error 2017-06-12 15:35:50 +02:00
Laurent Destailleur
2916444f6c Fix check on module product for external user 2017-06-12 15:30:00 +02:00
Laurent Destailleur
279e6ab304 Fix missing parameters 2017-06-12 14:54:03 +02:00
Laurent Destailleur
d7cbb598c1 Fix permission for external users 2017-06-12 14:30:00 +02:00
Laurent Destailleur
bf41056c68 Fix test on permission for widgets 2017-06-12 14:21:04 +02:00
Laurent Destailleur
8f383e3fa1 Fix template 2017-06-12 14:12:40 +02:00
Laurent Destailleur
ec24f223b5 Fix permission on widget 2017-06-12 12:55:57 +02:00
Laurent Destailleur
cd08690646 Fix ajax search product that return bad json response 2017-06-12 12:42:06 +02:00
Laurent Destailleur
8f7371cdf0 Product has 2 status. Add span to differentiate for css 2017-06-12 12:24:42 +02:00
Laurent Destailleur
0207f86aa5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-12 12:03:26 +02:00
Laurent Destailleur
98708acf57 Fix bad name of css file 2017-06-12 12:00:11 +02:00
Laurent Destailleur
6d130351a0 Fix css 2017-06-12 11:32:10 +02:00
Alexis Algoud
0312d2479d add block info popin, translation, hidden authority feature 2017-06-12 10:26:24 +02:00
Laurent Destailleur
277dde5d61 Fix dol_banner 2017-06-12 10:25:28 +02:00
Laurent Destailleur
b80ee49032 Add missing currency for bengladesh 2017-06-11 19:27:21 +02:00
Laurent Destailleur
58c4144123 Fix sort of dictionnary 2017-06-11 19:27:07 +02:00
Laurent Destailleur
ca324346e4 Update doc 2017-06-11 19:08:40 +02:00
Laurent Destailleur
248c5acff2 Fix remove a FIXME tag. 2017-06-11 16:18:21 +02:00
Laurent Destailleur
5471170a97 Merge pull request #6969 from atm-alexis/NEW_blocklog_develop_refactor
NEW blockedlog hash and authority
2017-06-11 15:54:47 +02:00
atm-ph
5157981751 Fix 6962 wrong permission check 2017-06-11 12:59:54 +02:00
Laurent Destailleur
e99d57802b Merge pull request #6986 from atm-ph/fix_6982
Fix 6982 missing parameter to get more informations about files
2017-06-11 12:56:48 +02:00
atm-ph
946e72f269 Fix 6982 missing parameter to get more informations about files 2017-06-11 12:26:51 +02:00
Laurent Destailleur
a96362e2f9 Fix #formmailbeforetitle not supported everywhere 2017-06-11 11:40:01 +02:00
Laurent Destailleur
961594afad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-11 10:38:09 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
4274d9910c Merge pull request #6976 from atm-ph/fix_6910
Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is used we got BadFirst…
2017-06-11 00:36:51 +02:00
Laurent Destailleur
074c43920a Create projects.php 2017-06-11 00:35:03 +02:00
Laurent Destailleur
43eb080242 Merge pull request #6970 from atm-ph/fix_6944
Fix 6944 compatibility PHP7 and missing parameter to call delete func…
2017-06-11 00:32:43 +02:00
Laurent Destailleur
b19e0e3cae Create card.php 2017-06-11 00:31:58 +02:00
Alexis Algoud
11d2a5538b fix entity default value and add link to download blockchain 2017-06-11 00:03:01 +02:00
Laurent Destailleur
3f9c7db4c1 Fix duplicate tabs 2017-06-10 23:56:43 +02:00
Laurent Destailleur
542a72c684 NEW custom dir is enabled dy default on first install.
Fix modulebuilder when custom dir not defined.
2017-06-10 23:50:46 +02:00
Laurent Destailleur
a74d008ff2 Fix missing translation 2017-06-10 22:57:25 +02:00
Laurent Destailleur
4683ef41be Fix hide search label on computed field into lists 2017-06-10 22:49:16 +02:00
Laurent Destailleur
acfaec684d FIX CVE-2017-7888 2017-06-10 22:31:22 +02:00
Laurent Destailleur
36b18f0300 Save MAIN_VERSION_FIRST_INSTALL that is not erased. 2017-06-10 22:11:12 +02:00
Laurent Destailleur
9c482b9f2a FIX CVE-2017-7886 2017-06-10 21:37:27 +02:00
Laurent Destailleur
d037515e37 FIX SQL injection on user/index.php parameter search_statut.
Conflicts:
	htdocs/user/index.php
2017-06-10 20:10:57 +02:00
Laurent Destailleur
b62da4bb7a Fix a parameter is required to know what we share. 2017-06-10 20:04:24 +02:00
Laurent Destailleur
890ac81e4d Fix menu entried must be greyed, sub menus not visible fi not allowed on
parent.
2017-06-10 19:16:42 +02:00
Laurent Destailleur
75452e6d19 Fix compatibility php 5.5- 2017-06-10 16:29:25 +02:00
Laurent Destailleur
ce470b8dd5 Fix css fot liste_total lines 2017-06-10 16:23:24 +02:00
atm-ph
039130c694 Fix travis 2017-06-10 16:19:33 +02:00
Laurent Destailleur
20f1bb76cb Fix memu under disabled entries, when using smartphone 2017-06-10 16:13:37 +02:00
atm-ph
6b4e22ec3c Fix 6910 if conf PROJECT_USE_SEARCH_TO_SELECT is used we got BadFirstParameterForGETPOST 2017-06-10 16:07:56 +02:00
Laurent Destailleur
b6af1f7e6e Fix responsive design 2017-06-10 15:21:49 +02:00
atm-ph
0d24df9ffc Fix 6939 new path for pictures is not used 2017-06-10 14:40:17 +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
atm-ph
5dfb988cb1 Fix 6944 compatibility PHP7 and missing parameter to call delete function 2017-06-10 13:34:28 +02:00
Laurent Destailleur
7c0de18ac1 Fix code comment 2017-06-10 12:56:28 +02:00
Alexis Algoud
3cae54c296 fix travis 2017-06-10 10:10:34 +02:00
Alexis Algoud
4fd24f6d8c fix travis 2017-06-10 09:58:07 +02:00
Alexis Algoud
63b3010c2e fix sql 2017-06-10 09:28:07 +02:00
Alexis Algoud
3d5899edf3 final blockedlog init 2017-06-10 09:25:32 +02:00
Laurent Destailleur
2a6c21bd03 Fix permissions on script file 2017-06-10 01:13:26 +02:00
Laurent Destailleur
87c8659e72 Fix responsive 2017-06-10 00:45:18 +02:00
Laurent Destailleur
c2b171dd73 Merge pull request #6967 from atm-ph/fix_wrong_attribute_name
Fix wrong attribute name for loop
2017-06-10 00:13:09 +02:00
Laurent Destailleur
def6403828 Merge pull request #6966 from atm-ph/fix_develop_can_not_update_extra
Fix can not update extrafields values
2017-06-10 00:11:20 +02:00
Laurent Destailleur
4b4b2ad1b7 Merge pull request #6965 from atm-maxime/fix_converttoreduc
Fix : button convert was still available even if deposit was already …
2017-06-10 00:10:45 +02:00
Laurent Destailleur
58a407d9f1 Fix style and align when no permission on widget 2017-06-10 00:05:47 +02:00
Laurent Destailleur
884c6c674d Fix css 2017-06-09 20:08:23 +02:00
Laurent Destailleur
0458b7d38f Fix css subscription form 2017-06-09 17:29:34 +02:00
Laurent Destailleur
3347316d3c Fix delete of member 2017-06-09 17:02:05 +02:00
phf
c1f3a168cd Fix wrong attribute name for loop 2017-06-09 16:57:20 +02:00
phf
0f80ee757f Fix can not update extrafields values 2017-06-09 16:37:05 +02:00
Laurent Destailleur
9341d5f448 FIX Line of invoices not inserted when using POS module and VAT NPR. 2017-06-09 15:35:27 +02:00
Laurent Destailleur
cc37a7d848 Fix parenthesis 2017-06-09 13:11:34 +02:00
Laurent Destailleur
24eebfeb61 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-09 12:57:14 +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
985a9ed8d3 FIX Redirect to payment page from member subscription page failed if a
unique security key was defined.
2017-06-09 12:12:12 +02:00
Laurent Destailleur
1935de03c7 Fix bad consistency of labels 2017-06-09 12:01:55 +02:00
Laurent Destailleur
41586b76c0 Fix missing css 2017-06-09 11:40:35 +02:00
Laurent Destailleur
62933e9a26 Fix sql syntax error in some cases 2017-06-09 11:22:42 +02:00
Maxime Kohlhaas
92b7914ef3 Fix : button convert was still available even if deposit was already converted 2017-06-09 11:09:06 +02:00
Laurent Destailleur
02781b41ca Fix several problem with hook printFieldListWhere 2017-06-09 11:02:34 +02:00
Laurent Destailleur
b92980c6ff Fix statistics on products 2017-06-09 10:38:06 +02:00
Laurent Destailleur
bec6ad9fb3 Fix bad position of hook 2017-06-09 10:22:07 +02:00
Laurent Destailleur
929946ad47 Fix several problem with hook printFieldListWhere 2017-06-09 10:12:01 +02:00
Laurent Destailleur
d6ba16d357 Fix missing printFieldListWhere hook 2017-06-09 09:45:22 +02:00
Laurent Destailleur
d326f161ef Fix permission on page to print barcode 2017-06-09 01:06:52 +02:00
Laurent Destailleur
a63050bf46 FIX Warnings
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/images.lib.php
2017-06-09 00:38:30 +02:00
Laurent Destailleur
811b0d9af4 Fix missing thumbs images for products 2017-06-09 00:27:44 +02:00
Laurent Destailleur
75624376a5 FIX Warnings 2017-06-09 00:27:19 +02:00
alexis Algoud
9b3b2e600f init blockedlog trigger and hash store 2017-06-08 17:52:02 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Laurent Destailleur
e027528545 Clean module builder 2017-06-08 14:24:12 +02:00
Laurent Destailleur
543630e487 Fix missing count of nb of columns into lists 2017-06-08 14:14:06 +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
57f3d0910e Merge pull request #6738 from grandoc/new_branch_20_04
Update code using new css class
2017-06-08 11:00:49 +02:00
Laurent Destailleur
20fb12bc7d Merge pull request #6959 from aspangaro/6.0-fec2
NEW : Accountancy - Activate multi-journal everywhere & Add journal_label information to database (FEC)
2017-06-08 10:56:53 +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
Laurent Destailleur
cfe9d02bc3 Merge pull request #6952 from atm-ph/fix_search_extrafield_on_list
Fix can't use search on all extrafields on list
2017-06-08 10:18:55 +02:00
Laurent Destailleur
97f9d8a87e Merge pull request #6957 from aspangaro/6.0-vat2
Fix : Missing ref of getNomUrl in AccountLine (Bank)
2017-06-08 10:16:32 +02:00
Alexandre SPANGARO
3827903afb Merge remote-tracking branch 'uptream/develop' into 6.0-vat2
# Conflicts:
#	htdocs/compta/salaries/card.php
2017-06-08 06:44:48 +02:00
Alexandre SPANGARO
5e3a2e06d4 NEW : Accountancy - Activate multi-journal & Add journal_label to database (FEC) 2017-06-08 06:35:09 +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
Laurent Destailleur
3427413255 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-07 11:13:25 +02:00
Laurent Destailleur
0805c693ae Fix restore of last_search_value ko 2017-06-07 10:55:39 +02:00
Alexandre SPANGARO
a96049d0e6 Spaces!!! 2017-06-07 06:06:53 +02:00
Alexandre SPANGARO
c041fe2165 Fix : Missing ref of getNomUrl in AccountLine (Bank) 2017-06-07 06:03:52 +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
bb37c2f980 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_transverse
2017-06-06 13:54:33 +02:00
phf
707a9e40c0 Fix can't use search on all extrafields on list 2017-06-06 12:01:49 +02:00
Laurent Destailleur
6a82d9e656 Merge pull request #6950 from defrance/patch-13
Additionnal filter on getProjectsAuthorizedForUser
2017-06-06 11:10:05 +02:00
Laurent Destailleur
4bda7fcafc Merge pull request #6949 from aspangaro/6.0-vat2
NEW : VAT payment v6 look and feel
2017-06-06 11:08:50 +02:00
Laurent Destailleur
0486a18972 Fix: use dolGetFirstLastname 2017-06-06 11:07:35 +02:00
Regis Houssin
03df365eea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 11:01:42 +02:00
Laurent Destailleur
63920930bf Merge branch 'develop' into 6.0-salary 2017-06-06 11:01:28 +02:00
Laurent Destailleur
eb45333685 Merge pull request #6946 from grandoc/develop
FIX : bug #6943
2017-06-06 10:55:18 +02:00
Laurent Destailleur
4b6bd2b6eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-06 10:54:17 +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
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +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
Laurent Destailleur
c50006c91b Merge pull request #6936 from aspangaro/6.0-multijournal
Accountancy - Activate multijournal on bank_journal
2017-06-06 10:38:05 +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
florian HENRY
ca5fd6ac4c FIX #6926 2017-06-06 09:15:11 +02:00
BENKE Charlene
6e83e899e2 Additionnal filter on getProjectsAuthorizedForUser
with great list of projects, have more filter is a good thing
2017-06-06 08:29:41 +02:00
Laurent Destailleur
22efbabfa6 NEW Add hook doUpgrade2 2017-06-06 01:34:25 +02:00
Alexandre SPANGARO
e547aa8aee NEW : VAT payment v6 look and feel 2017-06-05 15:41:33 +02:00
Alexandre SPANGARO
2281850abf Fix label and name 2017-06-05 14:56:14 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
philippe grand
a0b4f8b004 FIX : bug #6943 2017-06-04 12:09:54 +02:00
Maxime Kohlhaas
6787d717f9 Update bonprelevement.class.php 2017-06-03 18:23:19 +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
0eadef9a7a Fix: merge correction 2017-06-03 11:46:18 +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
Alexandre SPANGARO
ef9275d031 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
# Conflicts:
#	htdocs/core/menus/standard/eldy.lib.php
2017-06-03 07:48:50 +02:00
Alexandre SPANGARO
90c1a38486 Accountancy - Activate multijournal on bank_journal 2017-06-03 07:23:14 +02:00
Laurent Destailleur
344263f53c Fix travis 2017-06-03 02:22:21 +02:00
Laurent Destailleur
504ea85334 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-03 01:55:27 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
2017-06-03 01:55:05 +02:00
Laurent Destailleur
3555bd2bd7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
2017-06-03 01:29:59 +02:00
Laurent Destailleur
d9794f942d Prepare 5.0.4 2017-06-03 01:17:33 +02:00
Laurent Destailleur
37a261587e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-03 01:17:03 +02:00
Laurent Destailleur
75a01cbe7e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-03 01:13:06 +02:00
Laurent Destailleur
af01e544d5 Merge branch 'develop' into fix_develop_missing_entity_column 2017-06-03 01:11:49 +02:00
Laurent Destailleur
4e397107e1 Merge pull request #6934 from atm-florian/dev_loancalc
NEW : Add calculation function for Loan schedule
2017-06-03 01:10:39 +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
f0ff2b3085 Merge pull request #6931 from atm-arnaud/FIX_contratligne_update
FIX contratligne update
2017-06-03 01:02:56 +02:00
Laurent Destailleur
98586f3b2d Merge pull request #6930 from atm-ph/fix_5.0_wrong_agenda_view_link
Fix week view link has wrong link
2017-06-03 01:02:40 +02:00
Laurent Destailleur
af584bc9c0 FIX #6880 #6925 2017-06-03 00:58:51 +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
atm-ph
70a188c042 Fix missing column entity on llx_accounting_journal after init demo with the bash 2017-06-02 21:45:02 +02:00
Laurent Destailleur
5e29817910 Init of the onlinesign 2017-06-02 20:17:08 +02:00
Laurent Destailleur
9e629bdb02 Work on modulebuilder 2017-06-02 20:01:25 +02:00
Laurent Destailleur
bfa50b8d1d Fix some security issues 2017-06-02 19:36:03 +02:00
Laurent Destailleur
1761df2bc2 NEW Add page statistics for project tasks 2017-06-02 19:28:22 +02:00
florian HENRY
b0f2db7aaa NEW : Add calculation function for Loan schedule 2017-06-02 17:48:29 +02:00
Laurent Destailleur
447db1b324 Fix orphelins for categories tables 2017-06-02 13:46:30 +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
arnaud
df883a601b FIX contratligne update 2017-06-02 12:28:50 +02:00
Laurent Destailleur
bebf2b33ea CSS enhancement for mobile 2017-06-02 09:25:35 +02:00
Laurent Destailleur
5c58ed8ca7 Add a better error message when payment link is not valid. 2017-06-02 09:13:04 +02:00
Laurent Destailleur
976c8e0752 Fix security to test access on a task 2017-06-01 19:53:54 +02:00
Laurent Destailleur
b4f1df03de Update doc 2017-06-01 19:18:57 +02:00
Laurent Destailleur
dd2d9f533a Clean duplicated vars 2017-06-01 18:18:57 +02:00
Laurent Destailleur
76e1438fe6 FIX REST api to get project when user has permission to read all. 2017-06-01 17:29:47 +02:00
phf
31aa8bdf05 Fix week view link has wrong link 2017-06-01 16:26:32 +02:00
Laurent Destailleur
9b4c929d79 NEW Add phpunit to check the engine is defined into sql create files. 2017-06-01 16:09:09 +02:00
gauthier
fb252706f9 FIX : situation_progress param default value must be 100 and not 0 2017-06-01 15:42:19 +02:00
Laurent Destailleur
f4cdb6b254 Fix month on 2 chars. Some setup return on 1 char only. More phpunit
assert.
2017-06-01 15:33:23 +02:00
Laurent Destailleur
7ad92c3a4d Fix new generic substitution system 2017-06-01 13:32:20 +02:00
Laurent Destailleur
733d1caac6 Correct usage of parameter 'none' in GETPOST 2017-06-01 12:37:16 +02:00
Laurent Destailleur
bb5a49eca4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-01 12:26:59 +02:00
Laurent Destailleur
07a6bb5664 More files to delete in migration 2017-06-01 12:26:17 +02:00
Laurent Destailleur
77df19009d Removed duplicated code 2017-06-01 12:11:45 +02:00
Maxime Kohlhaas
0e175ba373 Fix : SEPA XML address should also have dolEscapeXML 2017-06-01 11:48:14 +02:00
Alexandre SPANGARO
9d83746935 Fix : Book entry in general ledger for salaries 2017-06-01 04:44:05 +02:00
Laurent Destailleur
417f71a8be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-01 02:01:34 +02:00
Laurent Destailleur
c70beaa56b Complete work for mutualizing generic substitution system. 2017-06-01 01:57:22 +02:00
Alexandre SPANGARO
dc9d9b47b4 Fix : Missing language key 2017-05-31 21:35:26 +02:00
Laurent Destailleur
40334dbe14 Merge pull request #6905 from atm-quentin/NEW_project_mask_with_user_extrafield
NEW_extrafield_in_project_mask
2017-05-31 19:46:22 +02:00
Laurent Destailleur
a49174313f Replace {extra_ with {user_extra_ 2017-05-31 19:45:54 +02:00
Laurent Destailleur
6837312041 Merge branch 'develop' into 6.0-vat2 2017-05-31 19:28:41 +02:00
Laurent Destailleur
6c7179d281 Test of commit with autoremove trail space 2017-05-31 19:20:33 +02:00
Laurent Destailleur
d5f83d6bbe NEW #6915 Simplest change. 2017-05-31 19:15:39 +02:00
Laurent Destailleur
d70c14a411 Update bonprelevement.class.php 2017-05-31 19:07:39 +02:00
Laurent Destailleur
d7d8e51ab1 Merge pull request #6912 from atm-gauthier/5.0_fix_originid_on_supplierproposal
FIX : origin & originid on supplierproposal
2017-05-31 19:01:29 +02:00
Laurent Destailleur
f829ccc11b Merge pull request #6908 from aspangaro/6.0-d3
Fix : Correct donation when we write operation in general ledger
2017-05-31 18:58:50 +02:00
Laurent Destailleur
7c29e286f8 Prepare 4.0.7 2017-05-31 13:31:17 +02:00
Laurent Destailleur
c9a09adf79 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/main.lang
2017-05-31 12:50:29 +02:00
Laurent Destailleur
10ac53077e Code comment 2017-05-31 11:51:38 +02:00
Laurent Destailleur
145cb628cd FIX dol_string_nohtmltag make 2 passes to clean html into html
attributes.
2017-05-31 11:11:25 +02:00
Laurent Destailleur
292571688b Fix error message not reported 2017-05-31 10:49:06 +02:00
Alexandre SPANGARO
21183f91a3 FIX : Vat payment - Sql error / Add information in tooltip / Correct writting in general ledger 2017-05-31 05:27:39 +02:00
Laurent Destailleur
c39ca4cff8 NEW Introduce function dol_compress_dir 2017-05-31 00:20:35 +02:00
Laurent Destailleur
48a6e9e038 Removed not used files 2017-05-30 22:31:57 +02:00
Laurent Destailleur
5d115bcf69 Fix deadlock feature, can't process a leave request when validator has
left company.
2017-05-30 20:58:32 +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
Maxime Kohlhaas
510b1aedcf Fix xml SEPA $ListOfFactures not used and was listing all invoices in each XML line 2017-05-30 16:13:49 +02:00
Maxime Kohlhaas
200f4010d8 Fix special char and size limit in SEPA XML 2017-05-30 16:00:39 +02:00
gauthier
6b7c4cbbe1 FIX : default param 2017-05-30 16:00:21 +02:00
gauthier
c66695bd56 FIX : origin & originid on supplierproposal 2017-05-30 15:35:51 +02:00
Laurent Destailleur
10975112ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-30 09:46:33 +02:00
Alexandre SPANGARO
a0de94ae09 Fix : Correct donation when we write operation in general ledger 2017-05-30 06:28:19 +02:00
Laurent Destailleur
fa6bc03765 Fix typo 2017-05-30 01:34:20 +02:00
Laurent Destailleur
d9cdad6a77 Merge pull request #6904 from OPEN-DSI/core_holiday_add_triggers
NEW Core Holiday: Add triggers for create, update and delete functions of the class Holiday
2017-05-30 01:26:20 +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
Quentin Vial-Gouteyron
f563746310 NEW_extrafield_in_project_mask 2017-05-29 15:38:40 +02:00
Laurent Destailleur
ad656e6d35 Look and feel v6 2017-05-29 15:34:00 +02:00
Laurent Destailleur
59ab9a4421 FIX #6850 2017-05-29 15:25:37 +02:00
Laurent Destailleur
400b3320aa NEW Introduction option MAIN_HTTP_CONTENT_SECURITY_POLICY 2017-05-29 15:20:50 +02:00
Laurent Destailleur
c71488e58b Removed deprecated code 2017-05-29 15:09:13 +02:00
Laurent Destailleur
ae6c58fb57 FIX #6808 2017-05-29 14:16:09 +02:00
David
d8c5ec2aef FIX: REST API not possible to add agendaevents 2017-05-29 13:47:42 +02:00
Regis Houssin
96b8339d21 Fix: [Restler] Delete the cache file otherwise it does not update 2017-05-29 13:46:03 +02:00
Laurent Destailleur
d2813eabbc FIX #6877
Conflicts:
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
2017-05-29 13:41:59 +02:00
Laurent Destailleur
19b8918caf FIX #6881 2017-05-29 13:40:08 +02:00
Laurent Destailleur
4824942369 FIX #6877 2017-05-29 13:39:07 +02:00
Laurent Destailleur
85e0ded573 FIX #6881 2017-05-29 13:35:51 +02:00
Laurent Destailleur
7066ec7dab NEW Can clone expense report on another user 2017-05-29 13:22:52 +02:00
Laurent Destailleur
6f723490c2 Fix syntax error 2017-05-29 12:58:23 +02:00
Laurent Destailleur
3bd3387664 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-29 12:56:11 +02:00
Laurent Destailleur
b74a0dd5fd Look and feel v6 2017-05-29 12:06:26 +02:00
Laurent Destailleur
3bf38d663f Merge pull request #6890 from defrance/patch-11
menu descriptor must be only present in main
2017-05-29 12:00:49 +02:00
KHELIFA
3402718425 Core Holiday: Add triggers for create, update and delete a holiday
Fix the user parameter in the call of the create, update and delete functions of the class Holiday
2017-05-29 11:58:16 +02:00
Laurent Destailleur
478349174c Merge pull request #6902 from aspangaro/6.0-salary
NEW : Move employee in dol_banner in salaries
2017-05-29 11:47:10 +02:00
Laurent Destailleur
cce05a4070 Merge branch 'develop' into 6.0-d2 2017-05-29 11:45:13 +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
Laurent Destailleur
395d361d66 Look and feel v6 2017-05-29 11:38:23 +02:00
Laurent Destailleur
30bc8b9a32 Fix typo 2017-05-29 11:00:36 +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
85c3880479 Look and feel v6 2017-05-29 10:58:41 +02:00
Laurent Destailleur
0c5bf21f3a Merge pull request #6900 from aspangaro/6.0-d1
Review expense report - Look and feel v6
2017-05-29 10:56:57 +02:00
Laurent Destailleur
f363845cbe Merge pull request #6899 from hregis/develop_bug_restapi
Fix: [Restler] Delete the cache file otherwise it does not update
2017-05-29 10:50:43 +02:00
Laurent Destailleur
3f5cf0ee18 Merge pull request #6897 from hregis/develop_bug4
Fix: for view special values
2017-05-29 10:46:03 +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
BENKE Charlie
4c382f94e1 Changes done 2017-05-29 10:39:02 +02:00
Laurent Destailleur
05a537dfb6 Merge pull request #6895 from grandoc/new_branch_25_05
New branch 25 05
2017-05-29 10:33:28 +02:00
Laurent Destailleur
ea13e18f9e Merge pull request #6892 from hregis/develop_bug3
Fix: Wrong path for external module API REST
2017-05-29 10:30:09 +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
b22817c237 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/compta/facture/fiche-rec.php
2017-05-29 10:25:07 +02:00
Laurent Destailleur
425192ef84 Merge branch 'develop' into 6.0-multijournal 2017-05-29 10:23:46 +02:00
Laurent Destailleur
f265e7d86a Merge pull request #6888 from hregis/develop_bug2
Fix: wrong min value
2017-05-29 10:18:59 +02:00
Laurent Destailleur
dc246fa44c Merge pull request #6887 from hregis/develop_new
New: add REST api "dictionaryevents" for use with "agendaevents"
2017-05-29 10:16:35 +02:00
Laurent Destailleur
1da648402d Merge pull request #6886 from hregis/develop_bug
Fix: use encrypt for llx_const data
2017-05-29 10:16:07 +02:00
Laurent Destailleur
4a330af4bf Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:15:30 +02:00
Laurent Destailleur
aa0a369f06 Fix typo 2017-05-29 10:15:10 +02:00
Laurent Destailleur
d526fcc091 Merge pull request #6884 from hregis/5.0_bug
Fix: wrong SPECIMEN value
2017-05-29 10:14:52 +02:00
Laurent Destailleur
5ff85a6586 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:13:55 +02:00
Laurent Destailleur
de1db57a9d Merge pull request #6883 from dvasseur/develop
FIX: REST API not possible to add agendaevents
2017-05-29 10:12:33 +02:00
Laurent Destailleur
b7b2184fb6 Merge pull request #6879 from atm-arnaud/FIX_pagination_resources
FIX pagination on resources
2017-05-29 10:12:11 +02:00
Laurent Destailleur
d19a8929df Merge pull request #6875 from atm-ph/fix_develop_ref_column_inventory
Fix missing column ref on migration for inventory
2017-05-29 10:11:26 +02:00
Laurent Destailleur
4474fc8014 Merge pull request #6872 from aspangaro/6.0-pcard
Use getNomUrl for accounting account in product card
2017-05-29 10:05:06 +02:00
Laurent Destailleur
70636cc59f FIX SQL injection on user/index.php parameter search_statut. 2017-05-29 09:59:21 +02:00
Alexandre SPANGARO
0d3c5bcfa8 Update documents & info page - better look & feel v6 2017-05-29 06:35:53 +02:00
Alexandre SPANGARO
dad1abd55b NEW : Move employee in dol_banner in salaries 2017-05-29 06:22:21 +02:00
Laurent Destailleur
84a3cbb97a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-29 02:48:17 +02:00
Laurent Destailleur
d0f01085d8 Add more information on stripe payment 2017-05-29 02:44:14 +02:00
Laurent Destailleur
d03d179fa3 FIX Fullname when member is a moral entity with no name. 2017-05-28 23:43:24 +02:00
Alexandre SPANGARO
b0f2e95c7b Debug 2017-05-28 22:11:57 +02:00
Alexandre SPANGARO
095545e8d9 Fix : Correct bank transfert when we write operation on general ledger 2017-05-28 21:56:18 +02:00
Laurent Destailleur
c4f09b8894 Work on modulebuilder 2017-05-28 14:43:17 +02:00
Alexandre SPANGARO
48477e00fd Review payment part on expense report card 2017-05-28 06:49:17 +02:00
Laurent Destailleur
c651f1da45 Work on modulebuilder tool 2017-05-27 19:05:36 +02:00
Alexandre SPANGARO
570f9aaa9e Review old payment page for expense report 2017-05-27 08:18:53 +02:00
Alexandre SPANGARO
783cec0d6d Move to getNomUrl for expense report in bank entries 2017-05-27 07:21:59 +02:00
Alexandre SPANGARO
1711107420 FIX : colspan in bank entries 2017-05-27 07:11:17 +02:00
Regis Houssin
db9e068500 Fix: [Restler] Delete the cache file otherwise it does not update 2017-05-26 17:38:57 +02:00
Regis Houssin
ee2019ae37 Fix: limit to 100 by default to avoid freeze 2017-05-26 16:52:27 +02:00
Regis Houssin
f8fead4b90 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_new 2017-05-26 16:51:45 +02:00
BENKE Charlie
e4f7f2a0b2 $resaction need in 5.0.x too 2017-05-26 12:39:49 +02:00
Regis Houssin
95b2b1bd17 Fix: for view special values 2017-05-26 10:28:10 +02:00
Laurent Destailleur
7a1480d362 Look and feel v6 2017-05-26 00:02:41 +02:00
philippe grand
1f3a8b507e missing translation 2017-05-25 22:02:57 +02:00
Laurent Destailleur
ca08f814c1 Remove deprecated files 2017-05-25 19:38:42 +02:00
philippe grand
9dfc8a9dc8 fix : bad link 2017-05-25 19:13:13 +02:00
Regis Houssin
74e9b9bf0a Fix: Wrong path for external module API REST 2017-05-25 13:50:41 +02:00
Regis Houssin
18886849eb New: add REST api "memberstypes" 2017-05-25 08:54:30 +02:00
BENKE Charlie
b0bac770e5 menu descriptor must be only present in main
If we add the same menu descriptor 
the additionnal menu are added on the second, not the main
I propose to suppress it OR change "customers_bills" as "customers_bills_list" who allow to add some menu as sub-menu
2017-05-25 08:07:11 +02:00
Alexandre SPANGARO
db6d7d9e21 Spaces 2017-05-25 07:15:36 +02:00
Alexandre SPANGARO
e89c4e9f41 Merge remote-tracking branch 'uptream/develop' into 6.0-pcard 2017-05-25 07:15:03 +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
Regis Houssin
fea60e2675 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_bug2 2017-05-25 06:34:31 +02:00
Alexandre SPANGARO
a086b82f84 Removed old code (Function select_pcgtype/subtype) 2017-05-25 05:40:41 +02:00
Alexandre SPANGARO
ba7e754174 Remove old code (journal) 2017-05-25 05:32:13 +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
3782bc4458 Look and feel v6 2017-05-24 19:47:02 +02:00
Regis Houssin
659436f1ed Fix: wrong min value 2017-05-24 19:33:44 +02:00
Regis Houssin
339d9dbfdf New: add REST api "dictionaryevents" for to use with "agendaevents" 2017-05-24 18:44:03 +02:00
Regis Houssin
55121c5e05 Fix: use encrypt for llx_const data 2017-05-24 16:35:02 +02:00
Laurent Destailleur
160eb194ea Clean REST response for user and third parties 2017-05-24 15:24:35 +02:00
Laurent Destailleur
f011197e00 Update swagger to 2.0.24 2017-05-24 15:12:45 +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
6d4c5e4b4a Code comment 2017-05-24 11:37:44 +02:00
Regis Houssin
a3d8da0a73 Fix: wrong SPECIMEN value 2017-05-24 11:30:11 +02:00
David
3898cfe02f FIX: REST API not possible to add agendaevents 2017-05-23 18:27:41 +02:00
Laurent Destailleur
c98f0ba457 Fix typo 2017-05-23 15:57:18 +02:00
Laurent Destailleur
67b3e3da99 FIX #6784 2017-05-23 15:51:39 +02:00
Laurent Destailleur
cea98ce5cb Look and feel v6 2017-05-23 15:30:56 +02:00
Laurent Destailleur
80ce8da7a3 Fix migration errors and responsive design 2017-05-23 15:13:52 +02:00
Laurent Destailleur
3e37185b74 FIX download attached file on resource 2017-05-23 13:44:18 +02:00
Laurent Destailleur
5ebe711665 Look and feel v6 2017-05-23 13:38:48 +02:00
Laurent Destailleur
71bd69a804 Better link to show part to edit 2017-05-23 13:25:37 +02:00
arnaud
8781a19e0e FIX pagination on resources 2017-05-23 12:22:53 +02:00
Laurent Destailleur
2da50f1eca Look and feel v6 2017-05-23 01:32:19 +02:00
Laurent Destailleur
0cd030d856 NEW Introduce mass actions on contacts 2017-05-23 00:13:07 +02:00