lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,738 Commits 43 Branches 150 Tags 886 MiB
09baab1076
Commit Graph

56738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Laurent Destailleur
37d0e7a2e8 Doxygen 2016-11-30 16:17:54 +01:00
Laurent Destailleur
e846d74654 Fix sort on invlice list 2016-11-30 15:19:16 +01:00
Laurent Destailleur
b518e60ff5 Fix: message should not have color of warning 2016-11-30 15:04:45 +01:00
Laurent Destailleur
81e60f36e7 Fix: message should not have color of warning 2016-11-30 14:17:03 +01:00
BENKE Charlie
c23919c51a change left menu name of categorie 
It is impossible to add sub-menus to other categories left menus if not...
 2016-11-30 09:41:33 +01:00
Laurent Destailleur
d86c3931e2 Fix translation 2016-11-30 09:09:09 +01:00
bgenere
751651c4d4 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-30 08:37:57 +01:00
Laurent Destailleur
8fb5eca0ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-29 23:56:52 +01:00
Laurent Destailleur
874bb488da Fix bad comment 2016-11-29 23:42:56 +01:00
Laurent Destailleur
0ec9dd9b88 Merge pull request #6048 from ozit/patch-1 
an extra comma at the end
 2016-11-29 23:37:41 +01:00
Laurent Destailleur
592b9d0b20 Merge pull request #6061 from mrsof/patch-6 
Fix: Product barcode generation in edit mode
 2016-11-29 23:34:18 +01:00
Laurent Destailleur
ef029dc602 Merge pull request #6057 from atm-alexis/5.0_FIX_typhon_model 
FIX column too small, header on 2 lines
 2016-11-29 23:23:19 +01:00
Laurent Destailleur
4bff869507 Merge pull request #6056 from aspangaro/5.0-p38 
Presentation of social contribution
 2016-11-29 23:22:58 +01:00
Laurent Destailleur
dce3d5d888 Merge pull request #6055 from aspangaro/5.0-p37 
Fix: Presentation of donation card
 2016-11-29 23:21:46 +01:00
Laurent Destailleur
6624630cd1 Merge pull request #6052 from atm-alexis/FIX_bad_date_for_warning_check 
FIX date for warning test might be the same as in propal list
 2016-11-29 23:20:44 +01:00
Laurent Destailleur
52205241e3 Merge pull request #6046 from defrance/patch-47 
FIX Enabling intervention to process
 2016-11-29 23:05:05 +01:00
Laurent Destailleur
401ce91883 Merge pull request #6045 from aspangaro/5.0-p36 
Fix: Expense report list return empty date field
 2016-11-29 23:04:16 +01:00
Laurent Destailleur
22e2c3ed29 Fix missing pagination on supplier payments 2016-11-29 23:02:37 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
711961ed18 Fix missing translation 2016-11-29 17:24:40 +01:00
bgenere
2e45a8e8b3 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-29 17:15:00 +01:00
Laurent Destailleur
f6734be1a1 Fix security hole. Add quick and fast hack to fix it 2016-11-29 17:08:44 +01:00
Laurent Destailleur
9ff38ee136 Add missing currency for madagascar 2016-11-29 12:28:17 +01:00
Sof
e05de2942b Fix: update informations 2016-11-29 12:19:01 +01:00
Sof
53d1dbf4b9 Fix: Codebar suggestion in edit mode 2016-11-29 12:06:58 +01:00
Laurent Destailleur
39c2088aa5 Fix constant 2016-11-29 11:23:15 +01:00
Laurent Destailleur
c33e486828 Fix order of option and picto 2016-11-29 10:42:10 +01:00
Laurent Destailleur
f267273251 Missing translation 2016-11-29 10:38:27 +01:00
Alexis Algoud
360c952e5a FIX column too small, header on 2 lines 2016-11-29 09:50:55 +01:00
aspangaro
953feefb6a Social contribution in adaptive mode (Payment are under the information) 2016-11-29 06:43:16 +01:00