lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,001 Commits 43 Branches 150 Tags 886 MiB
2fffd2fa6f
Commit Graph

11645 Commits

Author SHA1 Message Date
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
75624376a5 FIX Warnings 2017-06-09 00:27:19 +02:00
Regis Houssin
4c70908ea2 Fix: entity field in combobox 2017-06-08 18:52:01 +02:00
alexis Algoud
9b3b2e600f init blockedlog trigger and hash store 2017-06-08 17:52:02 +02:00
Regis Houssin
ade915af5f New: add dictionnary sharing (multicompany) 2017-06-08 16:36:42 +02:00
Regis Houssin
4b98a1aefd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_dict 2017-06-08 15:05:45 +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
832e288814 FIX #6955 2017-06-08 10:47:22 +02:00
Regis Houssin
1baa620688 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict
 2017-06-08 10:33:26 +02:00
Laurent Destailleur
7587a3d592 Merge branch 'develop' into develop_transverse 2017-06-08 10:25:04 +02:00
Regis Houssin
44dba391c1 New: add dictionnary sharing (multicompany) 2017-06-08 10:24:16 +02:00
Regis Houssin
b183c6e7ac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_transverse
 2017-06-07 20:23:24 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
a0295821ba Fix errors in extra computed field 2017-06-07 11:38:42 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Regis Houssin
03df365eea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_transverse 2017-06-06 11:01:42 +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
Laurent Destailleur
22efbabfa6 NEW Add hook doUpgrade2 2017-06-06 01:34:25 +02:00
Alexandre SPANGARO
806d25ae41 Activate multi-journal on expensereport journal 2017-06-05 06:44:53 +02:00
Regis Houssin
74710827b2 Fix: avoid warning "Undefined property: 
stdClass::$AGENDA_DEFAULT_FILTER_TYPE"
 2017-06-03 14:15:34 +02:00
Regis Houssin
a25facef7c Fix: use 0 instead false 2017-06-03 11:49:59 +02:00
Regis Houssin
2df33d1df3 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-03 11:45:15 +02:00
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
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
832e9ed15a Merge pull request #6932 from atm-ph/fix_develop_get_extra_chkbxlst 
Fix get extrafields value from getOptionalsFromPost give an error wit…
 2017-06-03 01:04:18 +02:00
Laurent Destailleur
e1b19b831a NEW An external module can hook and add mass actions 2017-06-02 23:57:37 +02:00
Laurent Destailleur
66420d0e80 Restore lost file and better generation of modules 2017-06-02 23:02:48 +02:00
Laurent Destailleur
9e629bdb02 Work on modulebuilder 2017-06-02 20:01:25 +02:00
Laurent Destailleur
1761df2bc2 NEW Add page statistics for project tasks 2017-06-02 19:28:22 +02:00
Laurent Destailleur
c59d216cf5 NEW Can read time spent of others (hierarchy only or all if granted) 2017-06-02 13:24:45 +02:00
phf
64cd1e0923 Fix get extrafields value from getOptionalsFromPost give an error with chkbxlst type on propaldet for exemple 2017-06-02 12:31:03 +02:00
Laurent Destailleur
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
76e1438fe6 FIX REST api to get project when user has permission to read all. 2017-06-01 17:29:47 +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
77df19009d Removed duplicated code 2017-06-01 12:11:45 +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
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
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
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
Laurent Destailleur
c39ca4cff8 NEW Introduce function dol_compress_dir 2017-05-31 00:20:35 +02:00
Regis Houssin
aa780ea33b Fix: missing dot 2017-05-30 19:15:37 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
fa6bc03765 Fix typo 2017-05-30 01:34: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
c71488e58b Removed deprecated code 2017-05-29 15:09:13 +02:00
Laurent Destailleur
6f723490c2 Fix syntax error 2017-05-29 12:58:23 +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
Laurent Destailleur
ab5545d02d Merge pull request #6898 from defrance/patch-12 
$resaction need in 5.0.x too
 2017-05-29 11:41:22 +02:00
BENKE Charlie
18799c3a7f Changes Done 
question
need to change $actionclassinstance->results in $actionclassinstance->resactionss ???
 2017-05-29 11:00:08 +02:00
Laurent Destailleur
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
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
16456cf19f Merge pull request #6891 from hregis/develop_api 
NEW add REST api "memberstypes"
 2017-05-29 10:29:04 +02:00
Laurent Destailleur
425192ef84 Merge branch 'develop' into 6.0-multijournal 2017-05-29 10:23:46 +02:00
Laurent Destailleur
70636cc59f FIX SQL injection on user/index.php parameter search_statut. 2017-05-29 09:59:21 +02:00
Laurent Destailleur
d03d179fa3 FIX Fullname when member is a moral entity with no name. 2017-05-28 23:43:24 +02:00
Laurent Destailleur
c4f09b8894 Work on modulebuilder 2017-05-28 14:43:17 +02:00
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
BENKE Charlie
e4f7f2a0b2 $resaction need in 5.0.x too 2017-05-26 12:39:49 +02:00
Regis Houssin
18886849eb New: add REST api "memberstypes" 2017-05-25 08:54:30 +02:00
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
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
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
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
Laurent Destailleur
67b3e3da99 FIX #6784 2017-05-23 15:51:39 +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
1a8884bbbe NEW Can filter on year and product tags on the product statistic page 2017-05-22 15:20:52 +02:00
Laurent Destailleur
a3eef35ce6 Fix travis error 2017-05-22 01:19:16 +02:00
Laurent Destailleur
ecce1c2037 Remove conf 2017-05-21 23:58:19 +02:00
Laurent Destailleur
090a7028d7 Fix constant usage 2017-05-21 23:41:04 +02:00
Laurent Destailleur
965e23b711 Test to fix a regression 2017-05-21 19:45:47 +02:00
Laurent Destailleur
5cb38ece19 Fix travis errors 2017-05-21 19:37:15 +02:00
Laurent Destailleur
6aa6ef1f9f Fix travis error 2017-05-21 18:30:43 +02:00
Laurent Destailleur
52b5a8ece7 More powerfull dol_move function. 2017-05-21 14:06:43 +02:00
Laurent Destailleur
5992175b68 Standardize code between customer and supplier invoice list. 2017-05-21 03:23:44 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Laurent Destailleur
2dd2ab1003 Look and feel v6 2017-05-20 20:59:54 +02:00
Laurent Destailleur
7e25cc0475 FIX Phpunit on file submit with REST API 2017-05-20 17:09:15 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
601f3ea75e Fix dol_check_secure_access_document in write mode, add phpunit tests 2017-05-20 11:31:03 +02:00
Laurent Destailleur
06b37d0e82 Work on dol_check_secure_access_document to support write question 2017-05-19 20:17:33 +02:00
Laurent Destailleur
807c77f754 Fix inconsistent options 2017-05-19 18:03:49 +02:00
Laurent Destailleur
30cedd154e Fix default value must apply only if restore_lastsearch_values is on 2017-05-19 15:42:11 +02:00
Laurent Destailleur
4e7353f8a0 Clean code 2017-05-19 13:39:00 +02:00
Laurent Destailleur
aec4cef5de Clean some code for type of event deprecated since 3.3 2017-05-19 12:58:38 +02:00
Laurent Destailleur
ff2a268831 NEW Architecture to manage search criteria persistance (using 
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
 2017-05-19 00:52:13 +02:00
Laurent Destailleur
88fc7dbc3e Fix remove warning 2017-05-18 19:24:44 +02:00
Laurent Destailleur
c18c401960 Merge pull request #6864 from atm-florian/5.0_fix6863 
FIX #6863
 2017-05-18 19:12:37 +02:00
Laurent Destailleur
92d7b907be Merge pull request #6844 from defrance/patch-10 
problems with additionnal template type
 2017-05-18 17:48:30 +02:00
Laurent Destailleur
7dbe3b1da9 Merge pull request #6843 from aspangaro/6.0-multijournal 
Fix : Sql error on salaries index for accountancy multijournal + debug
 2017-05-18 17:45:21 +02:00
florian HENRY
82cac745e3 FIX 6863 2017-05-18 14:18:59 +02:00
Laurent Destailleur
5a79d11389 Avoid warning 2017-05-18 13:14:56 +02:00
Laurent Destailleur
eaa4b650f8 Code comment 2017-05-18 13:01:48 +02:00
Laurent Destailleur
4a46480ef5 Fix preview of PDF contract 2017-05-18 12:40:20 +02:00
Laurent Destailleur
a36a9fab2f Look and feel v6 2017-05-18 12:12:36 +02:00
Laurent Destailleur
0b52c43e05 Fix bad selection of progress when not known 2017-05-18 11:35:12 +02:00
Laurent Destailleur
1a1b27d68c Fix input of duration 2017-05-18 11:13:18 +02:00
Laurent Destailleur
58f789659d Remove one picto loading 2017-05-18 02:53:49 +02:00
Laurent Destailleur
f3838ee8f2 Fix limit into message 2017-05-17 18:52:01 +02:00
Laurent Destailleur
b29f325fcf Work on search criteria persistence 2017-05-16 23:38:23 +02:00
florian HENRY
3890c67210 fix event thirdparty agenda do not show good owner 2017-05-16 19:08:59 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
cc16bb0bef Debug default value feature. 2017-05-16 12:22:55 +02:00
Laurent Destailleur
b29d0385e6 NEW Can send an email to a user from its card. 2017-05-15 00:15:56 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Alexandre SPANGARO
cedf5fb0ed Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal 2017-05-14 20:29:46 +02:00
Laurent Destailleur
998254d9c6 Finish rewrite and debug of module Stripe. 2017-05-14 16:17:23 +02:00
BENKE Charlie
8e68aa86ac problems with additionnal template type 
If i active my new xml templater, and keep odt, the odt folder is added on folder to scan on my xml path
ex : 
odt folder defined : c:\toto
xml folder defined : c:\tata

folder scanned with odt :  c:\toto
folder scanned with odt :  c:\toto,c:\tata
 2017-05-14 15:17:40 +02:00
Alexandre SPANGARO
143c019905 Fix : Sql error on salaries index for accountancy multijournal + debug 2017-05-14 08:07:34 +02:00
Laurent Destailleur
955c9f4217 Standardize the way online payments are working. 
Removed the trigger file of PAYPAL module that stored data that was not
used by Dolibarr. The trigger event still exists, but if an external
module need action on it, it must provides itself its trigger file.
 2017-05-13 21:10:56 +02:00
Laurent Destailleur
57ba598b15 Merge pull request #6771 from aspangaro/6.0-stripe 
New : Module Stripe
 2017-05-13 19:55:29 +02:00
Laurent Destailleur
e0abba5cf2 Merge pull request #6831 from Gecka-Apps/5.0-fixes 
Fix: when sending a mail the default template used should be the first positioned template
 2017-05-13 19:35:58 +02:00
Laurent Destailleur
54088f38fb Code standardization on online payment code 2017-05-13 14:03:09 +02:00
Laurent Destailleur
6f9e67b1fb Remove no more used constant 2017-05-13 13:08:25 +02:00
Laurent Destailleur
f7e042d7b8 Look and feel v6 2017-05-13 13:02:55 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
bccfa3dbed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-11 14:39:47 +02:00
Laurent Destailleur
b09300ab61 NEW Can edit background color for odd and even lines in tables 2017-05-11 13:02:29 +02:00
Laurent Destailleur
d3917b6065 FIX Bad return code of dolCpyDir 2017-05-11 12:25:53 +02:00
Laurent Dinclaux
8ae05a9651 Fix: when sending a mail the default template used should be the first positionned template 2017-05-11 13:38:17 +11:00
Laurent Destailleur
cd72c50356 Merge pull request #6799 from Dolibarr/scrutinizer-patch-2 
Scrutinizer Auto-Fixes
 2017-05-11 00:04:12 +02:00