Laurent Destailleur
03f13e99de
Fix regression. Icon was not icon of correct element.
2016-12-07 11:50:08 +01:00
Laurent Destailleur
ea3e2e4a95
Merge pull request #6082 from bgenere/develop
...
Fixed 2 issues for custom module development regarding import and dictionnaries list.
2016-12-07 11:34:15 +01:00
Laurent Destailleur
af222e3622
Merge pull request #6087 from fappels/Fix-travis
...
Fix travis
2016-12-07 11:26:23 +01:00
Laurent Destailleur
2a8f23e8c5
Fix labels
2016-12-06 15:03:39 +01:00
Laurent Destailleur
db9af0118c
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2016-12-06 14:08:43 +01:00
Laurent Destailleur
cfff6a8cb8
FIX Export of opportunity status must be code, not id.
2016-12-06 14:05:43 +01:00
Laurent Destailleur
017e384f16
FIX Preselected value for extrafield link was not correctly set
2016-12-06 13:10:44 +01:00
Laurent Destailleur
bd0b017571
Missing filters
2016-12-06 12:13:03 +01:00
Laurent Destailleur
0d7ab3301b
FIX in export. Error when using a separate extrafields.
2016-12-06 11:52:07 +01:00
fappels
b918d7abc9
fix travis
2016-12-05 19:20:46 +01:00
fappels
7776ae6da4
Fix travis
2016-12-05 19:19:48 +01:00
Laurent Destailleur
1a842d8366
Fix translation
2016-12-05 13:45:57 +01:00
Laurent Destailleur
5edf215b74
Add missing api file
2016-12-05 13:32:08 +01:00
Laurent Destailleur
761a795294
Maxi debug on REST APIs
2016-12-05 13:31:29 +01:00
Laurent Destailleur
0ff21f0bee
Fix example
2016-12-05 12:04:22 +01:00
Laurent Destailleur
f3bf5f82f8
FIX Minor fix on stock rounding for float qty before output on screen.
2016-12-05 11:18:54 +01:00
Laurent Destailleur
4b831537e5
Fix several problem in notes management of template invoices.
2016-12-04 21:27:08 +01:00
Laurent Destailleur
788cbf9a01
Complete work on dol_banner on contracts
2016-12-04 13:30:17 +01:00
Laurent Destailleur
211436b436
Better responsive
2016-12-04 01:14:09 +01:00
Laurent Destailleur
8c428ac5b7
Fix responsive design
2016-12-04 00:51:15 +01:00
Laurent Destailleur
2b8fbf200a
Complete work on the new dol_banner
2016-12-03 21:29:49 +01:00
Laurent Destailleur
888c4cd2ad
Fix corrupted value for pointoftax field
2016-12-03 20:15:56 +01:00
Laurent Destailleur
17bc24e83e
Complete repair
2016-12-03 20:05:49 +01:00
Laurent Destailleur
4abd417a6a
Corrupted data must be fixed by repair not by code hack.
2016-12-03 19:50:52 +01:00
Laurent Destailleur
fb2f33cfac
FIX Clean corrupted data
2016-12-03 19:48:08 +01:00
Laurent Destailleur
9c47f3d3fd
Restore protection to avoid errors
2016-12-03 19:41:03 +01:00
Laurent Destailleur
6e5a8b6787
FIX Some statistics not compatible with multicompany module.
2016-12-03 19:14:16 +01:00
bgenere
09baab1076
Fix display issue on step 4 of import in import.php.
...
The issue was only for custom module import as the entity was
initialised with the icone name i.e. filename@modulename.
Then the arrays entitytoicon and entitytolang where used. But by
definition custom modules do not have entries in these arrays.
So changed the assignement to proper object property when $entity is not
in these 2 tables. This is not changing behaviour of default object.
I have tested both with my custom objet and product object. So it should
be fine now.
2016-12-03 18:46:12 +01:00
Laurent Destailleur
b0ac0624db
FIX bad permission to see contract statistics
2016-12-03 18:21:55 +01:00
Laurent Destailleur
80f2623f9f
FIX bad permission to see contract on home page
2016-12-03 18:20:57 +01:00
Laurent Destailleur
fe54673a87
FIX List of people able to validate an expense report was not complete.
2016-12-03 18:13:23 +01:00
bgenere
5e1ee7c812
Merge branch 'develop' of git@github.com:bgenere/dolibarr.git into develop
2016-12-03 17:10:08 +01:00
bgenere
14bae3aa8e
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-03 16:57:35 +01:00
Laurent Destailleur
81a3235cf6
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/list.php
htdocs/fourn/facture/card.php
htdocs/fourn/facture/list.php
2016-12-03 16:01:18 +01:00
Laurent Destailleur
69b5baebc5
FIX rendering of output of estimated amount on project overview page.
2016-12-03 15:54:06 +01:00
Laurent Destailleur
7a3b309013
Fix width
2016-12-03 15:22:26 +01:00
Laurent Destailleur
a75577516d
Fix pb with multicompany on expense report
2016-12-03 15:13:04 +01:00
bgenere
1b23f66299
Merge remote-tracking branch 'upstream/develop' into develop
2016-12-02 18:00:34 +01:00
Laurent Destailleur
33139dd57a
Fix missing translation of page "disabled" and "offline".
2016-12-02 17:49:39 +01:00
Laurent Destailleur
b5453d5b73
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-12-02 14:52:54 +01:00
Laurent Destailleur
411e82b7a3
Fix button set to paid not always visible when it should.
2016-12-02 14:52:38 +01:00
Laurent Destailleur
61c77467ec
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2016-12-02 14:48:45 +01:00
Laurent Destailleur
495ba00cb6
Fix: Slurp, database corruption due to missing unique key on main key.
2016-12-02 14:21:46 +01:00
Laurent Destailleur
628d3ea6fa
Merge pull request #6067 from atm-arnaud/FIX_propal_updateline_oldcopy_extrafields
...
Fix propal updateline oldcopy extrafields
2016-12-01 21:50:09 +01:00
Laurent Destailleur
ae185105d6
Merge pull request #6064 from defrance/patch-48
...
Change left menu name of categorie
2016-12-01 21:47:21 +01:00
Laurent Destailleur
317df1cf91
Complete work on use of the new ol_banner_tab.
2016-11-30 20:24:36 +01:00
bgenere
65db4fdbf1
Merge remote-tracking branch 'upstream/develop' into develop
2016-11-30 18:31:44 +01:00
bgenere
9c62adb811
removed a vardump that was used for debug.
2016-11-30 17:46:53 +01:00
bgenere
18c6bb141d
going back to current version and use EXPORT_CSV_FORCE_CHARSET as a
...
workaround for my dev environment.
2016-11-30 17:12:17 +01:00
arnaud
c17d354367
Fix propal updateline oldcopy extrafields
2016-11-30 16:48:27 +01:00
