Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
60,834 Commits 36 Branches 189 Tags
c16cb15ce30ba644f33f01e32b273677007c8044
Commit Graph

11886 Commits

Author SHA1 Message Date
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
0d7ab3301b FIX in export. Error when using a separate extrafields. 2016-12-06 11:52:07 +01:00
fappels
c3b43e18d1 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 18:15:08 +01:00
Laurent Destailleur
1a842d8366 Fix translation 2016-12-05 13:45:57 +01:00
Laurent Destailleur
761a795294 Maxi debug on REST APIs 2016-12-05 13:31:29 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00
BENKE Charlie
d86503cb66 additionnal feature on supplier ref display 
we have like this 3 mode of display supplier ref
 2016-12-05 11:09:47 +01:00
BENKE Charlie
7ab7149e64 just little indenting 2016-12-05 11:03:12 +01:00
Milamber
e4006602f3 Fix the new 'Identifiant Commun de l'Entreprise' label in L10N files for Morocco (Maroc) 
Fix issue in pdf.lib.php to add the Prof ID 5 and 6

Ref: http://www.ice.gov.ma/ICE/
 2016-12-05 08:04:34 +00: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
2b8fbf200a Complete work on the new dol_banner 2016-12-03 21:29:49 +01:00
bgenere
1b23f66299 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-02 18:00:34 +01:00
fappels
c697141851 hide products in closed warehouse, but show products for internal transfer 
Products only for internal transfer should be sellable (for example,
they can have virtual stock)
 2016-12-02 12:22:09 +01:00
fappels
af5eb00933 Ignore filtering if service 2016-12-02 12:18:36 +01:00
fappels
b21fd14a11 Ignore Service, only filter warehouse if parameter set 2016-12-02 12:17:33 +01:00
florian HENRY
de5ad57af4 FIX : export extrafields must not include separe type 2016-12-02 12:02:08 +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
florian HENRY
c1652169f2 NEW : Add in export thirdparty for user limit on view thirpdarty to 
sales team also to subsidiaries
 2016-11-30 16:09:59 +01:00
fappels
2d4807190e Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-11-30 13:03:24 +01:00
fappels
49442c0b7f Add filter on warehouse status to object line product list 2016-11-30 13:03:17 +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
874bb488da Fix bad comment 2016-11-29 23:42:56 +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
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
bgenere
2e45a8e8b3 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-29 17:15:00 +01:00
Alexis Algoud
360c952e5a FIX column too small, header on 2 lines 2016-11-29 09:50:55 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
bgenere
093942bcd7 Fixed display issue for custom modules dictionnary not displayed 
properly when blank exists in dictionnary list for core modules.
 2016-11-28 15:37:24 +01:00
bgenere
a3fbe94f7c Cleaned-up code - removed syslog entry added for debug 2016-11-28 14:30:21 +01:00
bgenere
b81a1a9a1d Code was setting ISO charset as default wich was causing an issue with 
transnoentities as this method send back UTF-8. Result was that CSV file
was generated empty (tested on Unix Ubuntu workstation).
Replaced now with $conf->file->character_set_client so it works for me
(using UTF-8 by default.
To complete the fix my feeling is that we should not force charset till
we are not writing the final result. But needs to be confirmed by a
senior Dolibarr developer.
 2016-11-28 14:23:35 +01:00
Laurent Destailleur
5e5ce0043e Debug module ECM. 2016-11-28 12:03:33 +01:00
Marcos García de La Fuente
91be05932e Added missing modAttributes file 2016-11-27 21:50:27 +01:00
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +01:00
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +01:00
Laurent Destailleur
ce10dc618c Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact 
FIX missing extrafields of thirdparty on contact export
 2016-11-27 15:20:14 +01:00
Laurent Destailleur
2e5634e60f Fix responsive design 2016-11-27 14:21:23 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
gauthier
c433829d27 NEW : interface 2016-11-25 11:04:42 +01:00
florian HENRY
8ea49d8887 add extrafields thirdparty on contact export 2016-11-25 10:55:09 +01:00