lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,937 Commits 43 Branches 150 Tags 886 MiB
df1dfcbd8a
Commit Graph

41293 Commits

Author SHA1 Message Date
abb
ebf2edf019 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in set_draft class function 2015-05-23 15:35:19 +01:00
abb
879c82ee0a added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in trigger demo file 2015-05-23 15:28:51 +01:00
abb
4e48f24507 added new trigger for supplier invoice unvalidation "BILL_SUPPLIER_UNVALIDATE" in Database 2015-05-23 15:12:24 +01:00
abb
ba68598ec7 added new trigger for supplier invoice unvalidation in Agenda 2015-05-23 15:09:44 +01:00
Raphaël Doursenaud
5fe31e90c8 Remove duplicate modify button on user's card 
Fix #2879
 2015-05-23 15:32:09 +02:00
Alexis Algoud
91885c9d6f FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) 2015-05-22 17:22:57 +02:00
Laurent Destailleur
0b40502878 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-05-22 17:14:53 +02:00
Laurent Destailleur
dcc197eb6b Fix bug debian 786479 2015-05-22 17:13:32 +02:00
Laurent Destailleur
2f5d1f5965 Merge pull request #2842 from atm-alexis/fix_email_cc_in_selectlist_on_propal 
Fix email cc in selectlist on propal/bill
 2015-05-22 16:56:53 +02:00
Laurent Destailleur
4de46892d1 Merge pull request #2872 from atm-alexis/fix_button_create_payment_on_social_tax_less_than_1euro 
FIX button create payment hide if tax amount is less than 1
 2015-05-22 16:53:49 +02:00
phf
b9ed61eed4 FIX : update usergroup name 2015-05-22 16:46:28 +02:00
Laurent Destailleur
995a2c127d Working on finishing of look 2015-05-22 15:29:19 +02:00
Laurent Destailleur
390c7d8e65 Fix link to prospect with filter on commercial status 
Enhance natural_search method to allow to search on several ids.
 2015-05-22 15:19:27 +02:00
Laurent Destailleur
4319cd63a3 Working on finishing of look 2015-05-22 14:28:02 +02:00
Laurent Destailleur
97ba2cf0e9 Replace ol icon for delete with new one 2015-05-22 12:21:55 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is 
visible (for both external and internal users).
 2015-05-22 12:21:36 +02:00
Maxime Kohlhaas
ff6708840d Fix : facturestats was not filtering on invoice type 2015-05-22 09:23:28 +02:00
Alexis Algoud
81a919e8a3 round to price2num 2015-05-22 09:05:38 +02:00
Laurent Destailleur
f35c41cc7e Introduce hidden option "MAIN_FIX_FLASH_ON_CHROME" to solve a strange 
behaviour of chrome making page to be flashed before rendered.
 2015-05-22 01:48:36 +02:00
Laurent Destailleur
6108dfad55 Minor enhancement 2015-05-22 00:46:53 +02:00
Laurent Destailleur
fb923c0c2b Merge pull request #2867 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-21 21:33:42 +02:00
Laurent Destailleur
3b70013cf9 Merge pull request #2871 from GPCsolutions/dolibarr-2870 
Dolibarr 2870
 2015-05-21 21:24:28 +02:00
Laurent Destailleur
a09563435b Merge pull request #2840 from FHenry/develop 
NEW : add date value filter on account records list
 2015-05-21 21:22:31 +02:00
Francis Appels
793f68dc96 Qual: Remove unused pages 
Remove unused but maintained pages which contain errors and deadlinks.
 2015-05-21 20:13:41 +02:00
maxime peyrot
bcb4754585 FIX #2856 : Wrong table design 2015-05-21 17:40:36 +02:00
Alexis Algoud
9184b08f94 FIX button create payment hide if tax amount is less than 1 2015-05-21 16:51:21 +02:00
Raphaël Doursenaud
fc88df9ddf Fixed typo 2015-05-21 16:33:38 +02:00
Raphaël Doursenaud
38a9f6edae Drop deprecated fields 
Fix #2870
 2015-05-21 16:32:46 +02:00
Arnaud Aujon
6d5555948e Merge remote-tracking branch 'upstream/develop' into 3.7-webservices-fix 
Conflicts:
	test/phpunit/WebservicesInvoicesTest.php
 2015-05-21 13:11:41 +02:00
Alexis Algoud
bc672c2c23 FIX event for restricted user was restricted if company null 2015-05-21 11:49:10 +02:00
Laurent Destailleur
e075fce5eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-21 01:33:16 +02:00
Laurent Destailleur
90f9a845ae Enhance style 2015-05-21 01:32:56 +02:00
aspangaro
e23459d53b NEW Forms are using the tab look, even in creation mode 2015-05-20 21:50:38 +02:00
Raphaël Doursenaud
a7f6bbd316 Properly escape untrusted data to prevent HTML injection. 
First pass for #2857
 2015-05-20 17:34:00 +02:00
Marcos García de La Fuente
9ebae9520a Extrafields does not form part of this class 2015-05-20 16:46:12 +02:00
Marcos García de La Fuente
e24a8b4505 Closed bug #2843 Wrong SQL table called 2015-05-20 16:43:44 +02:00
Laurent Destailleur
f0cfa3406c Merge pull request #2852 from aspangaro/develop-resource 
NEW Forms are using the tab look, even in creation mode
 2015-05-20 15:27:08 +02:00
Laurent Destailleur
0f89164f4f Merge pull request #2849 from aspangaro/develop-ER_listlimit 
Fix: ER list don't respect $conf->liste_limit
 2015-05-20 15:26:34 +02:00
Laurent Destailleur
a49c6bce66 Merge pull request #2844 from tysauron/patch-3 
For backward compatibility ON update actioncomm
 2015-05-20 15:24:32 +02:00
Laurent Destailleur
4d35939d77 Merge pull request #2850 from aspangaro/develop-adherent 
Members: Review (Add background in create mode / Add button cancel / move type tab in member.lib)
 2015-05-20 15:24:09 +02:00
Laurent Destailleur
55b9d97081 Fix PHPCS 2015-05-20 15:22:59 +02:00
Laurent Destailleur
a05510c9df Merge pull request #2845 from tysauron/patch-2 
Bug : Declaration of CompanyBankAccount::create() should be compatibl…
 2015-05-20 15:19:42 +02:00
Laurent Destailleur
0e837f7540 Merge pull request #2848 from aspangaro/develop-md 
Add pagination style in every template
 2015-05-20 15:18:44 +02:00
Florian HENRY
0331ddc2de fix spacing 2015-05-20 11:30:27 +02:00
Florian HENRY
df4ee9562f fix spell 2015-05-20 11:29:35 +02:00
Florian HENRY
8fa3b8dac3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-20 11:24:49 +02:00
Florian HENRY
6e6b66e416 apply recommandation from 
ca53d3b602 (commitcomment-11245627)
 2015-05-20 11:24:23 +02:00
aspangaro
58e942681d NEW Forms are using the tab look, even in creation mode 2015-05-20 07:03:17 +02:00
aspangaro
b9bed14afe Fix: spaces   2015-05-20 06:38:36 +02:00
aspangaro
de5a15282c Adherent review 2015-05-20 06:25:43 +02:00
aspangaro
124dbbc2f2 Members: Add background in create mode in type adherent 2015-05-19 22:36:35 +02:00
aspangaro
40b65a642d Fix: ER list don't respect $conf->liste_limit 2015-05-19 22:22:18 +02:00
Laurent Destailleur
26a74ba3cc Add constant to allow a module to disable injection scan for its pages. 2015-05-19 22:08:51 +02:00
aspangaro
63b0dbd47b Add pagination style in every template 2015-05-19 21:59:44 +02:00
Francis Appels
40ef5737fc Fix: SQL error in facturestats on no view rights 
table alias sc must be available when user has no rights to view
customers. see where defenition line 80
 2015-05-19 16:34:21 +02:00
tysauron
572269bed1 For backward compatibility ON update actioncomm 
For backward compatibility when val=id   ON update actioncomm object
 2015-05-19 15:54:08 +02:00
Florian HENRY
ee1aa3268c working account 2015-05-19 11:55:45 +02:00
tysauron
d29aa083cf Bug : Declaration of CompanyBankAccount::create() should be compatible with Account::create($user = '') 2015-05-19 11:30:14 +02:00
Laurent Destailleur
62e1c55c97 NEW Introduce function dolGetFirstLineOfText 2015-05-19 00:44:05 +02:00
Laurent Destailleur
03acb1a8c9 Uniformize way to report error after "buildoc" action. 2015-05-19 00:01:30 +02:00
Laurent Destailleur
e2280ce93e NEW Can close a project that has draft status with no need to switch it 
to validate status before.
 2015-05-18 23:49:08 +02:00
Laurent Destailleur
4a70bb7acf Work on generic usage of get_exdir. 2015-05-18 23:04:49 +02:00
Laurent Destailleur
15c355efc9 A ref field must never be null. 2015-05-18 22:31:14 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
4d6b25eb45 Prepare to generalize usage of get_exdir 2015-05-18 21:47:44 +02:00
Laurent Destailleur
6d03ba228d Fix consistency of backup result message 2015-05-18 20:33:02 +02:00
Laurent Destailleur
e230d72cea Increase default date range to current month instead of current day 2015-05-18 19:41:23 +02:00
Laurent Destailleur
36cad55ed7 Merge pull request #2829 from bafbes/patch-6 
NEW Add date filtering into audit page
 2015-05-18 19:25:30 +02:00
Francis Appels
28e973331b Fix: update supplier orderline + rm deprecated prop 
- Fix SQL error in update supplier orderline
- Remove deprecated $libelle from product class, $libelle is removed
from code and can not be used anymore, no sense to mark deprecated.
- Add missing translation key
 2015-05-18 18:42:14 +02:00
Alexis Algoud
a4031a3680 if contact in sellist, it's an Id 2015-05-18 18:33:17 +02:00
Florian HENRY
3ef38ab959 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-18 13:14:04 +02:00
Florian HENRY
23eac58cc8 fix bug on new feature checkbox list form table 2015-05-18 13:13:50 +02:00
Florian HENRY
a6c5a247cd add total and title in page records banck account 2015-05-18 11:08:27 +02:00
Laurent Destailleur
7d51779610 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-18 11:01:19 +02:00
Laurent Destailleur
e561481f1e Add option THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT and 
THIRDPARTY_NOTCUSTOMERPROSPECT_BY_DEFAULT
 2015-05-18 10:58:04 +02:00
Florian HENRY
ca53d3b602 NEW : add date value filter on account records list 2015-05-18 10:43:54 +02:00
Laurent Destailleur
756de27a12 Fix syntax error 2015-05-18 09:11:34 +02:00
Laurent Destailleur
684686e0f6 Fix restore compatibility of new navigation style with jmobile 2015-05-18 08:59:58 +02:00
Laurent Destailleur
f0a1b7984f More complete test pages 2015-05-18 08:59:25 +02:00
Laurent Destailleur
d25a2af70c Fix PHPCS 2015-05-17 23:47:15 +02:00
Laurent Destailleur
36d164f779 Add field gender into table of user. 2015-05-17 23:43:57 +02:00
Laurent Destailleur
851007f1a8 Prepare database to manage recurring events 2015-05-17 20:12:49 +02:00
Laurent Destailleur
c89c883d7d Fix the new navigation style. 2015-05-17 19:37:37 +02:00
Laurent Destailleur
372ad4924b Add print_barre_liste into prototype. 2015-05-17 18:34:52 +02:00
Bahfir Abbes
1ba2240553 fix add to listevents.php 
use of dol_mktime + check dates order
 2015-05-17 16:13:50 +01:00
Laurent Destailleur
fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
 2015-05-16 17:09:42 +02:00
Laurent Destailleur
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2015-05-16 16:49:03 +02:00
Juanjo Menent
1d3bcc1d81 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0

Conflicts:
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
 2015-05-16 16:19:51 +02:00
Laurent Destailleur
1d8a3809f0 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-05-16 15:27:18 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +02:00
Laurent Destailleur
ad7c4a2b52 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-16 14:00:09 +02:00
Laurent Destailleur
0e1cf72c43 Fix bad order for firstname, lasname 2015-05-16 13:59:48 +02:00
Laurent Destailleur
4b13d5fafe Fix css 2015-05-16 03:11:08 +02:00
Laurent Destailleur
58b70f0503 Better translation 2015-05-16 03:07:29 +02:00
Laurent Destailleur
213c918a90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-16 02:53:56 +02:00
Laurent Destailleur
1b03e348d3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/annuel.php
 2015-05-16 02:53:36 +02:00
Laurent Destailleur
e382999b9e Css fix 2015-05-15 20:10:17 +02:00
Florian HENRY
f29d8aed5b Fix problem with multicompany on new feature Product propal merge PDF 
product
 2015-05-15 17:39:28 +02:00
Florian HENRY
4bc2d55cb3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00
Laurent Destailleur
976211b70f Look enhancement 2015-05-15 12:53:14 +02:00
Laurent Destailleur
c33cbefad2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 11:16:29 +02:00
Laurent Destailleur
4931401188 Fix new pagination style was not working correctly. 2015-05-15 04:33:01 +02:00
Laurent Destailleur
7b2230e437 Merge pull request #2774 from aspangaro/develop-pagination 
NEW Use larger button for navigation
 2015-05-15 03:57:29 +02:00
Laurent Destailleur
34fb863fc5 Merge pull request #2831 from aspangaro/develop-md 
Md_exp: Deactivate gradient into div.liste_titre & Attenuate lines #ddd -> #f4f4f4
 2015-05-15 03:53:23 +02:00
Laurent Destailleur
49a13f5e72 Debug of module expense report 2015-05-15 03:52:29 +02:00
Laurent Destailleur
3f5215169a Merge branch 'develop-ER_badge' of https://github.com/aspangaro/dolibarr 
into aspangaro-develop-ER_badge

Conflicts:
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/expensereport/card.php
	htdocs/expensereport/class/expensereport.class.php
 2015-05-15 02:44:43 +02:00
Laurent Destailleur
bf883e1576 Minor cosmetic changes 
Fix permissions and CRLF
 2015-05-15 02:34:57 +02:00
Bahfir Abbes
ffc5284a78 Update listevents.php 2015-05-14 20:17:52 +01:00
Laurent Destailleur
6d95de48c2 Css fixes 2015-05-14 20:49:22 +02:00
Laurent Destailleur
3e94cc07d2 Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
Laurent Destailleur
74607218ea Fight against key tva_taux. Removed completely. 2015-05-14 15:59:09 +02:00
Laurent Destailleur
33b9d492e2 Clean code 2015-05-14 15:43:07 +02:00
aspangaro
766c58724a ER: Review & add a totalVAT in pdf 2015-05-14 08:26:41 +02:00
aspangaro
bba0349ab6 ER: traduce code 2015-05-14 07:36:48 +02:00
aspangaro
81cf7a3d25 Merge remote-tracking branch 'Upstream/develop' into develop-md 2015-05-14 06:42:28 +02:00
Juanjo Menent
7c9bb10d6b Merge pull request #2826 from tysauron/patch-1 
Update list.php
 2015-05-13 21:27:01 +02:00
Juanjo Menent
3d1c0752d3 Merge pull request #2825 from fentman/patch-1 
Provide NotFound and Error return values
 2015-05-13 21:23:56 +02:00
Juanjo Menent
e3e6cff713 Merge pull request #2815 from bafbes/patch-4 
Fix forgotten last contributor information to list.php Update
 2015-05-13 21:16:16 +02:00
Juanjo Menent
d65721bb20 Insert option to use old system storage photos only if the first 
installation was done with a version < 3.7.0
 2015-05-13 20:34:57 +02:00
Bahfir Abbes
5191bffb1c improve events list view 
provide a finer grained view for this list and fix bug related to sorting control which wipes off other parameters
 2015-05-13 18:56:13 +01:00
Alexis Algoud
3dc5ffa871 FIX send mail, copy sendto don't read the list of contact 2015-05-13 18:05:26 +02:00
Laurent Destailleur
5937cd7f70 NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
tysauron
84935336ee Update list.php 
Bug pagination du bas quand recherche
 2015-05-13 17:04:35 +02:00
Laurent Destailleur
b327b5fb9d Save regressions 2015-05-13 09:32:54 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
Laurent Destailleur
8e09f54a46 Minor fixes 2015-05-13 07:46:12 +02:00
Michael Fenton
83e7c8a065 Provide NotFound and Error return values 
Providing a Not Found Message when a Third Party entity is not found to match with details provided, and providing an Error Message when the SQL Lookup fails.

This will help Asterisk Users determine whether the CallerID would be usable from Dolibarr or to reject and continue with existing CID from Asterisk
 2015-05-13 11:20:06 +10:00
Laurent Destailleur
1af2459d90 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-12 23:47:49 +02:00
Laurent Destailleur
b0d73ee674 FIX Bad link to login page into email for password renewal. 2015-05-12 23:47:28 +02:00
Laurent Destailleur
81d2d12035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 23:40:57 +02:00
Laurent Destailleur
ce0d728438 Merge pull request #2813 from bafbes/patch-3 
Update html.formfile.class.php
 2015-05-12 23:02:45 +02:00
Laurent Destailleur
39b4fc6455 Renamed readme file 2015-05-12 22:59:17 +02:00
Maxime Kohlhaas
942564be56 Fix : bad link when sorting shipment list #2823 2015-05-12 22:36:34 +02:00
Laurent Destailleur
4408648a68 Merge pull request #2817 from GPCsolutions/jqueryfixes 
jQuery fixes
 2015-05-12 22:36:12 +02:00
Laurent Destailleur
b3c9c3d91b Merge pull request #2818 from GPCsolutions/htmlfixes 
HTML fixes
 2015-05-12 22:34:35 +02:00
Laurent Destailleur
b99d2a8276 Merge pull request #2819 from GPCsolutions/typehinting 
[Qual] Typehinting
 2015-05-12 22:34:06 +02:00
Florian HENRY
8e61a03b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 21:02:36 +02:00
Raphaël Doursenaud
3b9388e57f Added typehinting to resultsets in database drivers 2015-05-12 19:51:41 +02:00
Raphaël Doursenaud
6558c0f1f2 Removed a bunch of unused variables 2015-05-12 19:47:15 +02:00
Raphaël Doursenaud
3fdc4ca5e0 Better type hinting for the SQLite3 database driver 2015-05-12 19:45:14 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest 
Add new core module : REST API
 2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
70d36dd1e3 Better type hinting for the SQLite database driver 2015-05-12 19:30:04 +02:00
Raphaël Doursenaud
67641280a4 Fixed parameter types 2015-05-12 19:16:29 +02:00
Raphaël Doursenaud
1fdff27184 Fixed type hintings 2015-05-12 19:11:12 +02:00
Raphaël Doursenaud
053f6ae494 [Qual] Fixed missing return statements 2015-05-12 19:10:47 +02:00
Raphaël Doursenaud
27d52cf2b0 Better type hinting for DoliDB 2015-05-12 19:01:01 +02:00
Raphaël Doursenaud
ccd14c8305 Better type hinting and code structure for the PgSQL database driver 2015-05-12 18:31:12 +02:00
Raphaël Doursenaud
4a01cf1256 Better type hinting for the Database interface 2015-05-12 18:30:16 +02:00
Raphaël Doursenaud
7231ca890a Better type hinting for the MSSQL database driver 2015-05-12 18:13:24 +02:00
Raphaël Doursenaud
6e6e63db50 Better type hinting and code structure for the MySQLi database driver 2015-05-12 17:56:01 +02:00
Raphaël Doursenaud
04f5e73557 Better type hinting for MySQL database driver 2015-05-12 17:16:46 +02:00
jfefe
125a34cb34 Fix PHPCS 2015-05-12 16:42:35 +02:00
jfefe
d079bc1507 Add comment to ignore PHPCs error due to restler framework 2015-05-12 16:35:05 +02:00
Raphaël Doursenaud
932e23ac09 [Qual] Use jQuery 'is' instead of 'prop' in conditions 2015-05-12 16:21:21 +02:00
Raphaël Doursenaud
aee61aa2c4 [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
9b56427858 [Qual] Fixed HTML multiple attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The multiple attribute is boolean.
 2015-05-12 15:11:47 +02:00
Raphaël Doursenaud
ce60ae0fcc [Qual] Fixed HTML readonly attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The readonly attribute is boolean.
 2015-05-12 15:09:26 +02:00
Raphaël Doursenaud
d5565fffc1 [Qual] Fixed HTML input form disabled attribute 2015-05-12 15:01:13 +02:00
Raphaël Doursenaud
e149d49fb8 [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Marcos García de La Fuente
190f12c4c4 Merge branch '3.5' into bug-2757 
Conflicts:
	ChangeLog
 2015-05-12 10:16:48 +02:00
Marcos García de La Fuente
ea7eb241e3 Close bug #2757 Deleting product category photo gives "Forbidden access" error 2015-05-12 10:15:43 +02:00
Bahfir Abbes
95a2e65d86 Update list.php 
Fix forgotten last contributor information
 2015-05-12 09:01:15 +01:00
Bahfir Abbes
142460ab16 Update html.formfile.class.php 
Fix forgotten last contributor information
 2015-05-12 08:53:09 +01:00
Laurent Destailleur
a94121a8c5 Add field to define picto to use for status 2015-05-12 09:42:14 +02:00
aspangaro
304a6936a5 Attenuate lines #ddd -> #f4f4f4 2015-05-12 06:58:29 +02:00
aspangaro
4cb9c3a147 Merge remote-tracking branch 'Upstream/develop' into develop-md 2015-05-12 06:44:41 +02:00
aspangaro
02d7c1cf01 Deactivate Gradient into div.liste_titre 2015-05-12 06:44:14 +02:00
Laurent Destailleur
8075a92d5b FIX Bad logo for status "Do not contact" of thirdparty. 2015-05-12 02:40:21 +02:00
Laurent Destailleur
973e2253bf Merge pull request #2797 from hregis/3.6 
Fix: add $object for use with triggers
 2015-05-12 00:14:22 +02:00
Laurent Destailleur
92a25e3d4c Prepare 3.7.1 2015-05-12 00:11:51 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
 2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
 2015-05-11 23:53:38 +02:00
Laurent Destailleur
2a486f471b Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/product/class/product.class.php
 2015-05-11 23:39:45 +02:00
Laurent Destailleur
ad993f246d Merge pull request #2795 from hregis/3.7 
Fix: add $object for use with triggers
 2015-05-11 23:36:43 +02:00
Laurent Destailleur
c59e365950 Merge pull request #2812 from bafbes/patch-1 
Update html.formfile.class.php
 2015-05-11 23:08:40 +02:00
Laurent Destailleur
acd7e7502b Merge pull request #2808 from aspangaro/develop-md 
Theme Md: Change font & divide by two the border-radius
 2015-05-11 23:04:11 +02:00
Laurent Destailleur
b2fa603f46 Merge pull request #2794 from hregis/develop_origin 
Fix: add $object for use with triggers
 2015-05-11 23:02:41 +02:00
Juanjo Menent
200b3b167e Merge pull request #2811 from bafbes/patch-2 
Update list.php and core/class/html.formfile.class.php
 2015-05-11 20:16:17 +02:00
Juanjo Menent
23bd8f50df Merge pull request #2809 from atm-maxime/develop 
New : Signature area on proposal PDF
 2015-05-11 20:09:54 +02:00
Juanjo Menent
97b9e87773 Merge pull request #2806 from marcosgdf/revert-25812f0 
Revert 25812f0
 2015-05-11 20:08:15 +02:00
Bahfir Abbes
280c6a04af Update list.php 
Correct erroneous links to supplier invoice documents in list
 2015-05-11 18:03:26 +01:00
Bahfir Abbes
3e4fcd1ac7 Update html.formfile.class.php 
in order to correct document lists in list of supplier invoices
 2015-05-11 17:51:54 +01:00
Laurent Destailleur
f275145bd2 FIX We did a test on a permission to export contract when permission did 
not exists.
 2015-05-10 23:46:34 +02:00
Laurent Destailleur
1714b8bdbe Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-10 23:44:02 +02:00
Laurent Destailleur
8b596d7a69 Fix css missing 2015-05-10 23:43:18 +02:00
Laurent Destailleur
a503d90982 FIX We did a test on a permission to export contract when permission did 
not exists.
 2015-05-10 23:37:04 +02:00
Laurent Destailleur
5bac040a9a Enhance prototype for select 2015-05-10 21:21:29 +02:00
Maxime Kohlhaas
443badfbcf New : Signature area on proposal PDF 2015-05-10 17:39:57 +02:00
aspangaro
fece843091 Theme Md: Change font & divide by two the border-radius 2015-05-10 15:08:53 +02:00
Marcos García de La Fuente
fb01f89e95 Unwanted deletion 2015-05-10 12:44:36 +02:00
Marcos García de La Fuente
9988b1ad4e Revert 25812f0 2015-05-10 12:43:21 +02:00
Marcos García de La Fuente
f6616deef3 Removed debugging function 2015-05-10 01:28:40 +02:00
Marcos García de La Fuente
f8e8b39ff2 FIX #2758 Product::update sets product note to "null" when $prod->note is null 2015-05-10 01:27:28 +02:00
Juanjo Menent
97ad7ca88b Code fixes 2015-05-09 14:23:26 +02:00
Juanjo Menent
ce1769d2c5 Merge pull request #2803 from simnandez/develop 
Code fixes
 2015-05-09 13:59:11 +02:00
Juanjo Menent
e07cebd50b Merge pull request #2793 from GPCsolutions/htmlfixes 
HTML fixes
 2015-05-09 13:58:43 +02:00
Juanjo Menent
27035b42b0 Merge pull request #2788 from GPCsolutions/testaccess 
Change low level access verification to a better high level one
 2015-05-09 13:55:17 +02:00
Juanjo Menent
d4e8e58e54 Code fixes 2015-05-09 13:25:40 +02:00
Juanjo Menent
577c872aaf Code fixes 2015-05-07 20:44:31 +02:00
Juanjo Menent
c5101ae5ea Code fixes 2015-05-07 20:07:47 +02:00
Florian HENRY
5395465cfd Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-05-07 17:24:51 +02:00
Florian HENRY
29f562460a fix [ bug #1926 ] [contract] Wrong Rights Checked 2015-05-07 17:23:32 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
 2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
c219d4a336 [Qual] Fix form label id reference 2015-05-07 14:21:13 +02:00
Laurent Destailleur
a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/core/modules/modContrat.class.php
	htdocs/expedition/class/expedition.class.php
 2015-05-07 13:35:09 +02:00
Laurent Destailleur
afc487ef9d Fix phpcs 2015-05-07 13:28:03 +02:00
Juanjo Menent
f993920d67 Commenting function 2015-05-07 13:23:00 +02:00
Laurent Destailleur
971e23e006 Fix special_code was lost when updating line 2015-05-07 12:10:27 +02:00
Regis Houssin
5578151bad Fix: add $object for use with triggers 2015-05-07 12:08:02 +02:00
Regis Houssin
85244ba8c9 Fix: add $object for use with triggers 2015-05-07 12:06:17 +02:00
Regis Houssin
9a32d7ec2f Fix: add $object for use with triggers 2015-05-07 12:02:24 +02:00
Laurent Destailleur
f197a94f59 Fix duplicate log 2015-05-07 10:52:41 +02:00
Laurent Destailleur
cc5968fbd5 A more complete error message 2015-05-07 10:45:35 +02:00
Raphaël Doursenaud
040df3c922 Change low level access verification to a better high level one 2015-05-07 10:32:20 +02:00
Laurent Destailleur
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00
Juanjo Menent
2707dcd283 Code fixes 2015-05-06 23:44:53 +02:00
Laurent Destailleur
36ebaf7a22 Clean code 2015-05-06 23:31:03 +02:00
Laurent Destailleur
b601a87a2a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-06 23:13:52 +02:00
Juanjo Menent
652ff9e67c Commenting function 2015-05-06 23:13:33 +02:00
Laurent Destailleur
3a8cf17f3c NEW Can edit list of prospect status for customers/prospects. Add a new 
entry into dictionary table to manage list fo status.
Removed deprecated files.
 2015-05-06 23:13:07 +02:00
fmarcet
e191fc41a3 FIX: Bug on order and supplier invoice numeration mask when use supplier 
code
 2015-05-06 21:39:06 +02:00
Juanjo Menent
7adbf033df Merge pull request #2759 from fmarcet/3.7 
FIX: Bug on order and supplier invoice numeration mask when use supplier
 2015-05-06 21:37:15 +02:00
Maxime Kohlhaas
1cb7d284a5 Fix : shipment PDF was not using generation params 
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
 2015-05-06 21:29:58 +02:00
Maxime Kohlhaas
72c4337f4b Fix : shipment PDF was not using generation params 
Conflicts:
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/fiche.php
 2015-05-06 21:18:31 +02:00
Juanjo Menent
33f98a4433 Merge pull request #2776 from aspangaro/develop-accountancy_patch1 
Accountancy: add a button to purge search criteria on list
 2015-05-06 20:53:46 +02:00
Juanjo Menent
ea95a461e2 Fix: Make propal pdf "azur" compatible with the two products images 
storage system on use MAIN_GENERATE_PROPOSALS_WITH_PICTURE
 2015-05-06 17:17:41 +02:00
Laurent Destailleur
e6e263d13f Add field to manage reccuring events 2015-05-06 16:44:41 +02:00
Laurent Destailleur
8efe0143f9 FIX Adding 5 more choice link into survey module was not working with 
chrome
 2015-05-06 16:37:04 +02:00
Maxime Kohlhaas
42455f771a Missing comments 2015-05-06 12:43:41 +02:00
Maxime Kohlhaas
d2603d5308 Fix : shipment was not considered as billed after classifybilled function 2015-05-06 12:39:10 +02:00
Maxime Kohlhaas
b203263e91 Fix : shipment PDF was not using generation params 2015-05-06 12:16:36 +02:00
jfefe
e5f0ab9324 Missing required class 2015-05-06 01:39:28 +02:00
jfefe
d62d7a2fc7 PHPCS again 2015-05-06 01:25:56 +02:00
jfefe
24bf614061 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into api_rest 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-05-06 01:00:11 +02:00
jfefe
dbb9449ee7 Fix PHPCS 2015-05-06 00:55:42 +02:00
Laurent Destailleur
db63a9783e More responsive design 2015-05-06 00:29:39 +02:00
aspangaro
10a895f1bd Accountancy: add a button to purge search criteria on list 2015-05-05 22:36:48 +02:00
Laurent Destailleur
4ce4529cd5 Revert "Remove useless variables for common object" 
This reverts commit 82682dfc66.
 2015-05-05 22:09:58 +02:00
Laurent Destailleur
a4675010ac Fix label 2015-05-05 22:08:53 +02:00
Laurent Destailleur
0410f29e81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-05 21:59:06 +02:00
Laurent Destailleur
b0baed83fc Prepare for email tracking 2015-05-05 21:50:48 +02:00
aspangaro
d06f1db7d0 Merge remote-tracking branch 'Upstream/develop' into develop-pagination 2015-05-05 21:42:34 +02:00
aspangaro
f092be58c8 New: Add visual pagination for use on tablet 2015-05-05 21:41:08 +02:00
Arnaud Aujon Chevallier
da8aaea343 Merge remote branch 'upstream/3.7' into 3.7-webservices-fix 2015-05-05 21:37:50 +02:00
Arnaud Aujon Chevallier
4fd8d6c05a fix typo 2015-05-05 21:37:10 +02:00
Raphaël Doursenaud
b91d1fa0ca dol_delete_files(): removed unused variables 2015-05-05 21:15:53 +02:00
Raphaël Doursenaud
7b542731a1 Made test pessimistic by default 
The test result was wrong if, for example, the path was wrong.
The unlink() function being never called, it returned the default true value even if it didn't
remove a file.
 2015-05-05 21:15:53 +02:00