Laurent Destailleur
4831fb4dcb
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2017-03-19 11:26:49 +01:00
Laurent Destailleur
5871d59db9
Fix error "Invalid default value for 'date_price'"
2017-03-18 15:25:49 +01:00
Laurent Destailleur
f7e71d1de2
FIX LOG_ERROR does not exists. Use LOG_ERR.
2017-03-18 11:48:02 +01:00
Laurent Destailleur
f0dddae6d1
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-03-18 11:38:32 +01:00
Laurent Destailleur
597fb11d08
Fix error management in duplicate trigger
2017-03-18 11:36:48 +01:00
Laurent Destailleur
4d6b20b785
Merge pull request #6540 from laudeco/fix/mailMassAction
...
fix the from e-mail on mass action
2017-03-18 04:34:37 +01:00
Laurent Destailleur
1e3c287eee
Merge pull request #6539 from simnandez/5.0
...
FIX #6537 Bug: SQL error: Missing , leads to wrong syntax
2017-03-18 04:33:14 +01:00
Laurent Destailleur
42898cd4cc
Merge pull request #6530 from defrance/patch-90
...
Add fin_validite, date_cloture in fetch
2017-03-18 03:53:34 +01:00
Laurent Destailleur
ee23e8b3d1
Merge pull request #6532 from fappels/5.0_fix_fourn_commande_class
...
Fix fourn commande class
2017-03-18 03:19:50 +01:00
Laurent Destailleur
7662ddc2fc
Merge pull request #6529 from dolibarr95/patch-4
...
NEW : Create a trigger for company create RIB
2017-03-18 03:18:31 +01:00
De Coninck Laurent
8c65c47b1f
fix the from e-mail on mass action
...
In mass action e-mail (like on facture), the from e-mail was not taken into account.
2017-03-17 17:55:25 +01:00
Juanjo Menent
5c028b30d5
Fix #6512 Bug: Invalid argument in when submitting orderstoinvoice.php-form
2017-03-17 17:05:59 +01:00
Juanjo Menent
f255b94e99
Fix #6537 Bug: SQL error: Missing , leads to wrong syntax
2017-03-17 16:10:40 +01:00
Laurent Destailleur
dfc1ed7d72
FIX #6535
2017-03-16 22:49:02 +01:00
Laurent Destailleur
7dd0f14563
Fix link to reconciliated function
2017-03-16 21:03:35 +01:00
Laurent Destailleur
68d3a93027
Fix link to reconcile
2017-03-16 20:36:51 +01:00
Laurent Destailleur
35b79818b7
Uniformize css rules
2017-03-16 20:33:51 +01:00
Laurent Destailleur
dba6d99686
Minor look enhancement
2017-03-16 17:02:30 +01:00
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
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
a70ccea654
Merge pull request #6516 from hregis/5.0_bug2
...
Fix: add md5 password for OpenLdap
2017-03-14 10:29:45 +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
