Commit Graph

64295 Commits

Author SHA1 Message Date
Laurent Destailleur
9a75cb466a
Merge pull request #7834 from ptibogxiv/patch-2
FIX list of donation not filtered on multicompany
2017-11-22 11:23:13 +01:00
Laurent Destailleur
62da0160e1
Merge pull request #7780 from fappels/develop_update_tablednd
FIX #3551 and #6823 table drag and drop not working.
2017-11-22 11:22:14 +01:00
Laurent Destailleur
e0cd0bd7ee
Merge pull request #7833 from elarifr/patch-accountancy-export-class
FIX Export to Quadra format date is wrong
2017-11-22 11:19:42 +01:00
Laurent Destailleur
dc5127e619
Merge pull request #7831 from ptibogxiv/patch-1
FIX createfromorder
2017-11-22 11:17:00 +01:00
Laurent Destailleur
46d1318a32
Merge pull request #7828 from papoteur-mga/develop
Fix:[proposals]Allow lines to be added from REST API
2017-11-22 11:16:32 +01:00
Laurent Destailleur
fd07d15423
Merge pull request #7850 from hregis/develop_member
NEW add possibility to remove address field
2017-11-22 11:15:23 +01:00
Laurent Destailleur
c3d8ef2104
Update functions.lib.php 2017-11-22 11:14:52 +01:00
Regis Houssin
a9bfe0f48f Fix: some problems with medias in multicompany (backport 6.0 commit 762b4eb876) 2017-11-22 10:12:51 +01:00
Regis Houssin
848a27283b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_member 2017-11-22 09:51:57 +01:00
Regis Houssin
1595bb1148 NEW add possibility to remove address field 2017-11-22 09:51:46 +01:00
Ion
7c6622f5b3 Merge resource/add.php to resource/card.php 2017-11-21 20:12:55 +01:00
vvnt
c74eef03dd
modSociete.class.php (spelling correction)
Minor spelling correction.
2017-11-21 15:17:02 +01:00
vvnt
005be3f69b
modPropale.class.php (spelling correction)
Minor spelling correction
2017-11-21 15:13:13 +01:00
vvnt
98998a7060
Update modFacture.class.php 2017-11-21 15:07:53 +01:00
Laurent Destailleur
2b95679b84 Add info to help spam fight 2017-11-21 14:09:15 +01:00
Laurent Destailleur
9bdd31e05a Module builder 2017-11-21 12:28:34 +01:00
Laurent Destailleur
533979987f Work on module builder 2017-11-21 11:56:49 +01:00
Laurent Destailleur
a630e665d9 Work on modulebuilder 2017-11-21 11:50:57 +01:00
Laurent Destailleur
ff9a62e519 Fix trackid from emailings 2017-11-21 11:15:33 +01:00
Laurent Destailleur
4b4412d5da Standardize file names for ECM 2017-11-20 19:40:34 +01:00
Laurent Destailleur
e19ca7b6d4 Work on generic filemanager 2017-11-20 18:19:41 +01:00
Frédéric FRANCE
6d33cc3980
align export bankjournal on others 2017-11-20 15:02:11 +01:00
fappels
8d318337d9 Check hound barking 2017-11-20 14:56:12 +01:00
fappels
37caa28e7e Update tablednd to v1.0 RC 2017-11-20 10:25:02 +01:00
Laurent Destailleur
818f43e7ad Work on generic filemanager 2017-11-19 22:04:24 +01:00
ptibogxiv
16e791913f
Fix import date
fix import date when creation
2017-11-19 21:56:50 +01:00
ptibogxiv
5d6555b9dd
Update list.php 2017-11-19 21:54:14 +01:00
ptibogxiv
3f360601af
Fix entity
Fix entity in list.php
2017-11-19 21:52:18 +01:00
Laurent Destailleur
6953420ce8 Support for ar_EG as laternative of ar_AS 2017-11-19 21:25:21 +01:00
Laurent Destailleur
5849efd9fc Work on public sharing files 2017-11-19 20:44:57 +01:00
Laurent Destailleur
04091e2c1a Sync transifex 2017-11-19 20:43:04 +01:00
Laurent Destailleur
e4b91ceb38 Add ar_EG 2017-11-19 20:33:06 +01:00
elarifr
c7129cdd71 quadra format date is wrong
need amount in cent without decimal symbol
need to remove accent as it give two ascii and break import
2017-11-19 19:42:16 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
248a359ac9 Fix phpcs 2017-11-19 16:30:05 +01:00
Laurent Destailleur
304819a726 Work on module builder 2017-11-19 16:26:39 +01:00
ptibogxiv
35182066a8
update createfromorder
lack of 2 fields date_start and date_end not imported from order
2017-11-19 16:25:35 +01:00
Laurent Destailleur
4938a0ba2a Add param forcenowrap on tooltip function 2017-11-19 12:41:37 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php
Move filemanager.tpl.php
CSS enhancement
2017-11-19 12:22:01 +01:00
Papoteur
dfffd7497e Correction of the previous commit.
Place the convertion into object at the good place.
2017-11-19 11:46:34 +01:00
Laurent Destailleur
9f5b73f4e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/website/index.php
2017-11-18 22:19:15 +01:00
Laurent Destailleur
9b1470dab5 Work on generic filemanager component 2017-11-18 22:13:19 +01:00
Papoteur
f3f182b5bc [proposals]Allow lines to be added from REST API
Prevously, only void lines was added. Need to convert array lines to object in this case.
2017-11-18 16:21:54 +01:00
Laurent Destailleur
7288c18574 Work on generic filemanager component 2017-11-18 15:41:30 +01:00
Laurent Destailleur
90684750c1 CSS 2017-11-18 13:09:12 +01:00
atm-ph
fbc761cbac Fix rename TContactId into socpeopleassigned 2017-11-18 12:36:03 +01:00
Laurent Destailleur
bcaccb1829 Add layout into link of sub resources to solve undesired cache effect 2017-11-18 12:35:25 +01:00
atm-ph
15a8f2037b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-11-18 11:54:21 +01:00
Laurent Destailleur
f284cd6c0f Fix phpcs 2017-11-18 02:15:56 +01:00
Laurent Destailleur
14946a0dfa Fix sort on status 2017-11-18 02:14:04 +01:00