Commit Graph

60001 Commits

Author SHA1 Message Date
Laurent Destailleur
0d6a99b35a Fix space 2017-03-16 11:01:35 +01:00
Laurent Destailleur
68e50d0c79 FIX Filter on date lost after submit on time spent page 2017-03-16 10:36:17 +01:00
fappels
c1b21db407 Merge remote-tracking branch 'refs/remotes/Dolibarr/5.0' into 5.0_fix_fourn_commande_class 2017-03-16 10:06:20 +01:00
fappels
f9c2bb0410 Fix create supplier order line label
Fix create line label
Fix read line rang, special_code and fk_parent_line
Remove create line rang, done by table default and $this->rang is
invalid, supplier order has no rang property.
2017-03-16 10:05:50 +01:00
BENKE Charlie
4e1799b2be Add fin_validite, date_cloture in fetch 2017-03-15 21:31:44 +01:00
Laurent Destailleur
deb91ad7c1 FIX Data lost during merge of thirdparties 2017-03-15 13:30:30 +01:00
Laurent Destailleur
6f25d6de24 Fix bad management of PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY 2017-03-15 12:33:06 +01:00
Laurent Destailleur
4c0ff38020 Fix closing boxes 2017-03-15 11:58:13 +01:00
Laurent Destailleur
e6d8b3c4db Css enhancement 2017-03-15 11:41:15 +01:00
Laurent Destailleur
888675016d NEW Can use dol_fiche_end without showing bottom border. 2017-03-15 11:13:30 +01:00
dolibarr95
0721e6af42 add condition
add condition check for $notrigger
2017-03-15 10:37:08 +01:00
dolibarr95
688073dc18 Create a trigger for company create RIB
Since there no 'trigger' executed when we create a RIB for a company (COMPANY_CREATE, COMPANY_MODIFY, COMPANY_DELETE not executed), I purpose a new one COMPANY_RIB_CREATE. If this PR is qualified i will purpose COMPANY_RIB_MODIFY and COMPANY_RIB_DELETE too.

tks
2017-03-15 10:31:45 +01:00
Laurent Destailleur
dc83dd45fe Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-15 00:04:35 +01:00
Laurent Destailleur
39c8f9a15a Fix country not preselected 2017-03-15 00:04:09 +01:00
Laurent Destailleur
76db6c9f18 Fix css and colspan 2017-03-14 21:02:26 +01:00
Laurent Destailleur
7f8c4d7d0f Fix CSS 2017-03-14 14:33:25 +01:00
Laurent Destailleur
ccbcd2b339 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-14 14:07:21 +01:00
Laurent Destailleur
6c392fad9f Fix CSS 2017-03-14 14:06:55 +01:00
Laurent Destailleur
ec7d48931e Merge duplicate menus/page on projects 2017-03-14 13:49:04 +01:00
Laurent Destailleur
78c3a1a3a1 Merge pull request #6012 from atm-florian/dev_NEW_copyeventfiles
NEW : option to copy attachment files of emails into the event document area
2017-03-14 11:04:05 +01:00
Laurent Destailleur
fc5d96b84b Add comments 2017-03-14 10:51:28 +01:00
Laurent Destailleur
75a7122667 Merge pull request #6523 from camlafit/patch-1
Run soffice in background
2017-03-14 10:47:03 +01:00
Laurent Destailleur
9827887643 Merge pull request #6519 from marcosgdf/bug-multiprices
FIX Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error
2017-03-14 10:45:47 +01:00
Laurent Destailleur
60a9268ff5 Merge pull request #6518 from marcosgdf/bug-6505
FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
2017-03-14 10:45:09 +01:00
Laurent Destailleur
ebe552ead5 Merge pull request #6521 from atm-arnaud/NEW_odt_others_objects
NEW odt generation possible for contract, product, user and user groups
2017-03-14 10:44:24 +01:00
Laurent Destailleur
d951114c18 Merge branch 'develop' into NEW_odt_others_objects 2017-03-14 10:44:05 +01:00
Laurent Destailleur
70db9400ad Merge pull request #6511 from aspangaro/6.0-charges
NEW : Add project to social contributions
2017-03-14 10:31:00 +01:00
Laurent Destailleur
214350a8f5 Merge pull request #6509 from marcosgdf/bug-6507
FIX #6507: Statistics counter show wrong total Contract numbers when the user does not have full access
2017-03-14 10:30:25 +01:00
Laurent Destailleur
a70ccea654 Merge pull request #6516 from hregis/5.0_bug2
Fix: add md5 password for OpenLdap
2017-03-14 10:29:45 +01:00
Laurent Destailleur
53abc326b6 Merge pull request #6508 from marcosgdf/bug-6503
FIX #6503: SQL error in "Last pending payment invoices"
2017-03-14 10:25:59 +01:00
Laurent Destailleur
9e7230e63a Merge pull request #6484 from fmarcet/3.9
Fix: Error when references are numeric
2017-03-14 10:24:44 +01:00
cam.lafit
67189fa683 Provide a home directory to java/soffice
By default www-data run as system user on /root directory, to prevent some error about right user we :
* move first to /tmp directory
* set /tmp as home www-data user

If needed admin sys can update *$home_java* to a valide www-data directory
2017-03-14 10:17:20 +01:00
Laurent Destailleur
5c8ead4b62 Merge pull request #6520 from joseplluis/patch-5
FIX html tag
2017-03-14 10:16:15 +01:00
camlafit
e0449cf17f Execute in background process
It's better to split command call in two part. Set command to execute with binary path and execute after in background
2017-03-14 09:56:30 +01:00
arnaud
3ab7bac511 FIX fresh install const 2017-03-14 09:37:51 +01:00
arnaud
192a825de8 NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class 2017-03-14 09:25:29 +01:00
Josep Lluís
14ed67499e FIX html tag
Fix incorrect html tag not closed
2017-03-14 00:26:47 +01:00
Marcos García de La Fuente
15d0e6abc5 Corrected bug where product multiprices admin page would not render properly due to a PHP fatal error 2017-03-13 20:33:21 +01:00
Marcos García de La Fuente
cd349ab6cc FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled
Close #6505
2017-03-13 20:17:31 +01:00
Regis Houssin
017d73792c Fix: add md5 password for OpenLdap 2017-03-13 15:00:44 +01:00
hugome
38ccf7ffdd Fix : Agenda getCalendarEvents hook
Return of getCalendarEvents on agenda page :
The array_merge change key of merged array.
2017-03-13 11:35:49 +01:00
Laurent Destailleur
a40142460d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-13 02:30:00 +01:00
Laurent Destailleur
6aeae12775 Fix medias could not be loaded 2017-03-13 02:28:58 +01:00
Laurent Destailleur
ca80c58853 Fix PHP error 2017-03-13 02:14:42 +01:00
Laurent Destailleur
3affcd7f52 FIX colspan 2017-03-13 02:12:24 +01:00
Laurent Destailleur
d3e1a01273 Translation 2017-03-13 02:12:18 +01:00
Laurent Destailleur
17eee4e141 Prepare 5.0.1 2017-03-13 02:11:03 +01:00
Laurent Destailleur
b8b32ae2e3 FIX colspan 2017-03-13 02:10:22 +01:00
Laurent Destailleur
520bdac510 Translation 2017-03-13 01:35:04 +01:00
Laurent Destailleur
e8a1f0ba46 Uniformize code 2017-03-12 17:10:32 +01:00