Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
59,869 Commits 36 Branches 189 Tags
69b26dcb4ebea5a36cd6dcfb9fbf4ced48a910de
Commit Graph

154 Commits

Author SHA1 Message Date
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
35b79818b7 Uniformize css rules 2017-03-16 20:33:51 +01:00
Laurent Destailleur
412be59f78 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-01-20 12:09:39 +01:00
Laurent Destailleur
16779be162 Fix missing email/multicompany field 2017-01-17 10:51:30 +01:00
Laurent Destailleur
d95ac3bbdd Fix warning 2017-01-16 00:16:20 +01:00
Laurent Destailleur
7bccaff28a Fix remove warnings 2017-01-15 23:32:14 +01:00
florian HENRY
a99ac7fb6b taking account @eldy remarks 2016-12-13 16:52:49 +01:00
florian HENRY
2f138c0c37 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_exportthirdparty 2016-12-13 16:49:39 +01:00
Maxime Kohlhaas
04ed2df827 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option 
# Conflicts:
#	htdocs/imports/import.php
 2016-12-11 16:20:46 +01:00
florian HENRY
a797c45e3b sdf 2016-12-09 16:28:06 +01:00
florian HENRY
1e39805945 integrate Eldy remarks 2016-12-09 16:14:43 +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
florian HENRY
8ea49d8887 add extrafields thirdparty on contact export 2016-11-25 10:55:09 +01:00
Maxime Kohlhaas
e5418a7624 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-11-06 11:36:08 +01:00
Laurent Destailleur
28933c31dd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2016-10-16 19:04:33 +02:00
Laurent Destailleur
2db38b4bcc Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/societe/list.php
 2016-10-16 19:02:36 +02:00
Sergio Sanchis Climent
567f7e5365 FIX: #5340 2016-10-14 00:43:10 +02:00
florian HENRY
4e34b6e0c6 Merge remote-tracking branch 'origin/develop' into develop 2016-10-12 19:00:32 +02:00
florian HENRY
cc28391944 NEW : Export thirdparty with payement terms and mode 2016-10-12 18:59:34 +02:00
Maxime Kohlhaas
51d5de2e22 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_modimport_update_option 2016-10-03 01:07:04 +02:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
 2016-09-30 13:04:14 +02:00
Laurent Destailleur
94dbe3da3f Fix the info if module are provided by module or not was wrong 2016-09-30 13:02:13 +02:00
Maxime Kohlhaas
5b9acef10c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_modimport_update_option 2016-08-23 10:51:00 +02:00
Maxime Kohlhaas
e6411dd246 Start work to allow updates in import module 2016-08-22 12:25:03 +02:00
Laurent Destailleur
b267402df6 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/main.lang
	htdocs/societe/rib.php
 2016-08-01 15:15:32 +02:00
Laurent Destailleur
ceb6199e87 Fix default numbering module of customer code was not enabled. 2016-07-30 12:31:32 +02:00
gauthier
2aa688e6f2 NEW : tests for LEFT JOIN 2016-06-07 09:39:48 +02:00
gauthier
85740a618e NEW : add restrictions on standard exports (societe, propal, expedition) 2016-06-06 16:21:05 +02:00
Maxime Kohlhaas
857454a28d For each module, no default permission on activation 2016-06-04 12:16:30 +02:00
Laurent Destailleur
b434dad21a Fix: remove a debug code 2016-04-29 18:34:56 +02:00
Fixit Management
c3a5a7aab8 Rollback modification in this file 2016-04-19 12:54:46 +02:00
Fixit Management
ee9f1f32c1 Update conf 2016-04-19 12:43:50 +02:00
Benlo
0166d2ec3a FR4763 add possibility to export contacts/thirdparty categories 2016-03-07 17:49:26 +01:00
Laurent Destailleur
02c0f52880 NEW Include sales representative into export of thirdparties 2016-02-24 16:56:24 +01:00
Laurent Destailleur
77cbd885f2 NEW Add minimum stock and desired stock into import/export profiles. 
NEW Add state into thirdparty export fields
 2016-02-22 15:30:27 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Laurent Destailleur
3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/comm/remise.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/price.php
 2016-02-15 01:37:23 +01:00
philippe grand
a15d03a676 fix : Strict Standards: Only variables should be passed by reference 2016-02-08 10:06:32 +01:00
BENKE Charlie
e2afe5460e Update modSociete.class.php 2016-02-05 23:37:31 +01:00
BENKE Charlie
5498b1cd5a Update modSociete.class.php 2016-02-04 18:06:43 +01:00
Laurent Destailleur
1e1d6d4955 Fix to be able to use dolibarr with a smartphone 2016-01-03 19:34:19 +01:00
Laurent Destailleur
12358c9721 FIX The import help was not visible on calculated fields 2015-11-23 12:20:43 +01:00
Laurent Destailleur
f5631cac45 NEW Introduce property module_position so a module can decide where it 
appears into list of modules.
 2015-11-17 00:58:12 +01:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
97096536b1 Fix #2526 The filter on type numeric is ok now. Sometimes we used 
"Number", sometimes "Numeric". I moved to "Numeric" everywhere to solve
bug and added a warning in log if an unknow value is still used in code.
 2015-09-12 15:20:55 +02:00
Laurent Destailleur
7951483c5f Fix: examples ko for import 
Fix bad picto for export
 2015-09-10 12:47:25 +02:00
Florian HENRY
6cb993c0b4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-10 11:20:03 +02:00
philippe grand
ec21916d3b translations missing 2015-09-07 15:55:26 +02:00
philippe grand
887a4107a1 translations missing 2015-09-07 15:40:55 +02:00
philippe grand
3a6271e714 translations missing 2015-09-07 15:29:51 +02:00