Commit Graph

43562 Commits

Author SHA1 Message Date
Laurent Destailleur
59a79442b0 Enhance code for select field list feature.
Add gender and employee on user list.
2015-11-11 17:05:18 +01:00
Laurent Destailleur
4ddfa6e1b5 Merge pull request #3956 from frederic34/patch-3
Update product.php
2015-11-11 15:51:09 +01:00
Laurent Destailleur
a0606cece9 Merge pull request #3955 from grandoc/develop
[Qual] Uniformize code
2015-11-11 15:50:48 +01:00
Christophe Battarel
cc35f2b738 Merge branch 'develop' into customerinfos 2015-11-11 15:46:22 +01:00
aspangaro
05b0ab2eab HRM: Add fk_establishment in llx_user to link an user to an establishment 2015-11-11 15:45:55 +01:00
aspangaro
bbab5e5bc3 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-11-11 15:38:52 +01:00
Laurent Destailleur
e673b18871 Merge pull request #3949 from marcosgdf/bug-3865
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
2015-11-11 15:36:34 +01:00
Christophe Battarel
0c40a6dda5 add hidden constant 2015-11-11 15:32:42 +01:00
aspangaro
54091a0661 Correct getNomUrl 2015-11-11 15:31:39 +01:00
philippe grand
12c5d02a7a [Qual] Uniformize code 2015-11-11 12:27:09 +01:00
aspangaro
e157d8b8d2 Update for fk_country 2015-11-11 08:52:28 +01:00
aspangaro
ca0c68a8e2 Merge remote-tracking branch 'Upstream/develop' into develop-hrm 2015-11-11 08:20:12 +01:00
aspangaro
e1b329e80a HRM: Update work 2015-11-11 08:16:06 +01:00
Frédéric FRANCE
2799dbf45b Update product.php 2015-11-10 23:02:54 +01:00
philippe grand
d06a445e01 [Qual] Uniformize code 2015-11-10 19:22:27 +01:00
Laurent Destailleur
13a0fa2c69 Missing css 2015-11-10 15:50:13 +01:00
Laurent Destailleur
b0419557b1 Exclude dir 2015-11-10 00:37:30 +01:00
Laurent Destailleur
98c32fa1ec FIX The label hidden was not supported when using jmobile 2015-11-10 00:36:33 +01:00
Alexis Algoud
99513ac9f3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter 2015-11-09 18:31:21 +01:00
frederic34
b8a84d68ec add messages 2015-11-09 18:19:10 +01:00
Alexis Algoud
68cbd4699b NEW multi event type for filter and get form in order to allow bookmark 2015-11-09 17:18:23 +01:00
Laurent Destailleur
19684f9a36 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-09 16:48:41 +01:00
Laurent Destailleur
f49fab8a7e Rename some files in english and increase fields size. 2015-11-09 16:48:30 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF
Previous one has been deprecated by upstream
2015-11-09 12:21:08 +01:00
Raphaël Doursenaud
e5915ce8d9 Upgraded PHPExcel to v1.8.1
Fixes issues with PHP 7
2015-11-09 12:19:48 +01:00
Raphaël Doursenaud
0e155be4e8 Reinstall ckeditor with composer
This time using the correct full package

Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
2015-11-09 12:18:50 +01:00
Raphaël Doursenaud
442431704b Upgraded ADOdb Date to v0.36
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
2015-11-09 12:16:04 +01:00
Raphaël Doursenaud
7c44198022 [Qual] Prevent GIT submodules in composer deps
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
2015-11-09 12:12:05 +01:00
Marcos García de La Fuente
80ef746348 Reverted unwanted changes 2015-11-08 19:23:02 +01:00
Laurent Destailleur
71fa347e8e FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
2015-11-08 18:40:12 +01:00
Marcos García de La Fuente
9cdf45e0a6 Fixed JS compatibility with multiprices price generator 2015-11-08 16:54:54 +01:00
Marcos García de La Fuente
9bc4b9f0bc Moved update function after updatePrice 2015-11-08 16:45:42 +01:00
Marcos García de La Fuente
7ebe032d6f FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
Close #3865
2015-11-08 16:01:12 +01:00
Laurent Destailleur
096ec3100d Merge pull request #3926 from frederic34/fccard
allow chaining and remove header exit
2015-11-08 15:49:33 +01:00
Laurent Destailleur
6ec33a94c6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-08 15:39:10 +01:00
Laurent Destailleur
bd56396394 Fix migration error 2015-11-08 15:38:57 +01:00
Marcos García de La Fuente
7f0d81d255 Missing changes of PR #3927 2015-11-08 15:12:31 +01:00
Marcos García de La Fuente
04243510f3 Little changes 2015-11-08 14:54:29 +01:00
Laurent Destailleur
e6ab6bdb8e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-11-08 14:38:01 +01:00
Laurent Destailleur
7a0206adce FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
2015-11-08 14:37:50 +01:00
Juanjo Menent
0ce7cad48c Merge pull request #3946 from aspangaro/3.7-1
Fix: Accountancy compatibility with subtotal & jalon module
2015-11-08 11:26:06 +01:00
Juanjo Menent
8eb74b5bd4 Merge pull request #3945 from grandoc/develop
[Qual] Uniformize code
2015-11-08 11:25:11 +01:00
Juanjo Menent
7673a73a65 Merge pull request #3939 from marcosgdf/bug-3836
FIX #3836 Unable to upload a document to an invoice under some circunstances
2015-11-08 11:21:16 +01:00
Juanjo Menent
59b3124d7d Merge pull request #3938 from marcosgdf/fr-3876
NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2
2015-11-08 11:20:36 +01:00
Juanjo Menent
f15e83e918 Merge pull request #3937 from marcosgdf/bug-3877
FIX #3877 HTML encoded strings when searching for a supplier invoice
2015-11-08 11:19:49 +01:00
Juanjo Menent
509b45a0d0 Merge pull request #3936 from marcosgdf/bug-3931
FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
2015-11-08 11:19:13 +01:00
Juanjo Menent
77284982d5 Merge pull request #3935 from marcosgdf/bug-3897
FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
2015-11-08 11:18:29 +01:00
Juanjo Menent
8377d6967a Merge pull request #3934 from marcosgdf/bug-3679
FIX #3679 Error when deleting a Localtax2 special payment
2015-11-08 11:16:07 +01:00
Juanjo Menent
a6f0baefc1 Merge pull request #3933 from marcosgdf/bug-3980
FIX #3890 Expected transactions bank account page, shows negative numbers
2015-11-08 11:15:31 +01:00
Juanjo Menent
9e11289f5b Merge pull request #3927 from marcosgdf/fr-3767
NEW #3767 Allow changing multiple prices of a product at once
2015-11-08 11:13:04 +01:00
Juanjo Menent
a02100e3c7 Merge pull request #3924 from atm-gauthier/develop_fix_script_creation
FIX : wrong coma in llx_opensurvey_sondage.sql creation script
2015-11-08 11:03:26 +01:00
aspangaro
f0a3bca4c2 Fix: Accountancy compatibility with subtotal & jalon module 2015-11-08 04:22:49 +01:00
Laurent Destailleur
1d2dab63a3 More space 2015-11-08 02:32:22 +01:00
Laurent Destailleur
333dd10874 Add a way to lin on bank receipt tab directly 2015-11-08 02:09:32 +01:00
Laurent Destailleur
7a423c04d4 Fix The only default value is value we just entered 2015-11-08 02:00:28 +01:00
Laurent Destailleur
fa8863d2ea Fix sql migration requests 2015-11-08 01:38:03 +01:00
Laurent Destailleur
e350b759d3 Increase number of last bank receits visible links 2015-11-08 00:52:25 +01:00
Laurent Destailleur
24dff1d842 NEW Statistic graphs on products offer a filter on product type (product
/ service or both)
2015-11-08 00:35:30 +01:00
Laurent Destailleur
b5c9602da4 Fix Use new look for left-right arrow 2015-11-08 00:08:50 +01:00
Laurent Destailleur
031b33d582 FIX Checkbox reconciliated no correctly checked with some Chrome
versions
2015-11-07 23:54:11 +01:00
Laurent Destailleur
3906cb79c5 NEW: Add parameter to add a link to use "date of invoice" in one click
when fille a payment card.
2015-11-07 23:46:07 +01:00
philippe grand
b34edeb751 [Qual] Uniformize code 2015-11-07 21:56:21 +01:00
Florian HENRY
a4fafae109 FIX : Remove column creation for table llx_product_fournisseur_price,
the column use un calss is fk_supplier_price_expression, and
fk_price_expression does not exist into lx_product_fournisseur_price sql
file declaration
2015-11-07 17:19:13 +01:00
Laurent Destailleur
4e64230ac9 NEW Add chart of product statistics 2015-11-07 16:25:14 +01:00
Laurent Destailleur
57e162d7f8 The component selectAjaxArray can return javascript part into a global
"delayed" variable so caller can output it at end of page. This reduce
the Flash Over Unstyle Content effect.
2015-11-07 15:46:06 +01:00
Marcos García de La Fuente
4a52d3c1b1 Removed unwanted change 2015-11-07 15:35:00 +01:00
Marcos García de La Fuente
84a152dc2e FIX #3836 Unable to upload a document to an invoice under some circunstances 2015-11-07 15:33:48 +01:00
Marcos García de La Fuente
75b4cb4727 NEW #3876 Renamed Product::isservice and Product::isproduct to match PSR-2 2015-11-07 14:37:47 +01:00
Marcos García de La Fuente
ba42a7779f FIX #3877 HTML encoded strings when searching for a supplier invoice
Close #3877
2015-11-07 14:34:26 +01:00
Marcos García de La Fuente
0451cc1e73 FIX #3931 [Insight] Logical operators should be avoided - in htdocs/core/class/extrafields.class.php, line 261
Close #3931
2015-11-07 14:31:12 +01:00
Marcos García de La Fuente
8ccb8c92e0 FIX #3897 Incorrect colspan in tr#tablelines > tr#trlinefordates
Close #3897
2015-11-07 14:29:38 +01:00
Marcos García de La Fuente
01854b3259 FIX #3679 Error when deleting a Localtax2 special payment 2015-11-07 13:51:09 +01:00
Marcos García de La Fuente
728f469c1e FIX #3890 Expected transactions bank account page, shows negative numbers 2015-11-07 13:43:59 +01:00
Marcos García de La Fuente
3bbedf1795 FIX #3707 Thirdparty bank account page table has a glitch 2015-11-07 13:39:34 +01:00
Laurent Destailleur
c0872d690e Use new banner for other tabs of product 2015-11-07 13:32:14 +01:00
Marcos García de La Fuente
b4c3804c91 FIX #3928 Creating a Customer order and a Customer invoice from a project, does not inherit payment conditions and method of payment of customer card 2015-11-07 13:21:03 +01:00
Laurent Destailleur
439e4a483d Doc comment 2015-11-07 12:37:05 +01:00
Laurent Destailleur
350ef610e9 Fix beluga pdf for projects. Add missing expense reports. 2015-11-07 12:36:34 +01:00
Marcos García de La Fuente
45b4122a95 NEW #3767 Allow changing multiple prices of a product at once 2015-11-07 12:29:51 +01:00
Laurent Destailleur
99f5211070 NEW Can use the * as a joker characters into search boxes of lists 2015-11-07 11:48:35 +01:00
Laurent Destailleur
09fb87e47d Prepare tables for categories/tags on projects. Looking for a dev to
implement categories/tags on projects !
2015-11-07 11:40:31 +01:00
frederic34
7349862b64 translations 2015-11-07 11:19:31 +01:00
frederic34
a597d6c379 allow chaining 2015-11-07 10:23:56 +01:00
frederic34
becce332dd allow chaining and remove header exit 2015-11-07 09:52:00 +01:00
Laurent Destailleur
e7554d377f Fix better error message 2015-11-06 19:07:05 +01:00
Laurent Destailleur
b2d9f21253 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-11-06 18:57:46 +01:00
Laurent Destailleur
d0e6db7f89 Use the new banner for first tab of products. 2015-11-06 18:57:35 +01:00
Gauthier
ef3c7f927e FIX : wrong coma in llx_opensurvey_sondage.sql creation script 2015-11-06 16:38:26 +01:00
Christophe Battarel
f52ae35dc6 NEW FEATURE PROPOSAL: on propale, order or invoice creation from
scratch, reload page after customer selection so its informations can be
loaded
2015-11-06 16:14:00 +01:00
Laurent Destailleur
9cb2d046d0 Merge pull request #3919 from marcosgdf/bug-3914
FIX #3194 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
2015-11-06 12:32:26 +01:00
Laurent Destailleur
fdd93554ce Merge pull request #3921 from marcosgdf/fr-3898
NEW #3898 Remove deprecated Product::hidden property
2015-11-06 12:31:44 +01:00
Laurent Destailleur
b723ca7d16 Merge pull request #3920 from marcosgdf/fr-3768
NEW Deprecated Product::setPriceExpression. Use Product::update instead
2015-11-06 12:30:57 +01:00
Laurent Destailleur
2c4b0c0d24 Merge pull request #3918 from FHenry/develop
FIX: #3913
2015-11-06 12:20:22 +01:00
Marcos García de La Fuente
ac8bee28ef NEW #3898 Remove deprecated Product::hidden property
Close #3898
2015-11-06 11:40:22 +01:00
Marcos García de La Fuente
9969179267 NEW Deprecated Product::setPriceExpression. Use Product::update instead 2015-11-06 11:35:39 +01:00
Laurent Destailleur
bef4dd2bae Merge pull request #3917 from atm-maxime/develop
Fix : finally, autofocus on product search field is a bad idea...
2015-11-06 11:27:37 +01:00
Marcos García de La Fuente
610ef2359d FIX #3914 Properties Product::multiprices_min and Product::multiprices_min_ttc, Product::url dynamically declared
Close #3914
2015-11-06 11:26:06 +01:00
Florian HENRY
28b229c83a FIX: #3916 2015-11-06 11:24:52 +01:00
Laurent Destailleur
11f0cad2ab FIX #3912 2015-11-06 11:22:50 +01:00
Florian HENRY
d3d62f7db5 FIX: #3913 2015-11-06 11:11:23 +01:00