Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
55,188 Commits 36 Branches 189 Tags
8edb51a017acca58c950f68e9dadd92a021dc29e
Commit Graph

9955 Commits

Author SHA1 Message Date
Laurent Destailleur
f6d1913bb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
 2016-02-22 13:35:46 +01:00
Laurent Destailleur
762ab060e4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 13:28:18 +01:00
Laurent Destailleur
355f091246 FIX Option MAIN_FORCE_STATE_INTO_ADDRESS and SOCIETE_DISABLE_STATE 2016-02-22 13:28:08 +01:00
Laurent Destailleur
945eb9f094 NEW Add the event BILL_PAYED to list of supported events for module 
notification.
 2016-02-22 12:52:01 +01:00
Laurent Destailleur
e7e6957073 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-22 09:27:53 +01:00
Laurent Destailleur
a4f189eea7 Fix do not show warning if account defined 2016-02-22 09:27:18 +01:00
Benoît Peccatte
c969b09ef7 Add support to product translation imports 2016-02-21 22:04:47 +01:00
Laurent Destailleur
0dc76fa1cd Merge pull request #4626 from IonAgorria/hide-hourmins-2 
Form changes to add duration info
 2016-02-21 19:22:13 +01:00
Laurent Destailleur
fb0e74645e Merge pull request #4663 from peckpeck/xlsx_support 
NEW Allow imports from xlsx files
 2016-02-21 19:12:38 +01:00
Benoît Peccatte
5a8d1f1c95 Allow imports from xlsx files 2016-02-21 14:10:19 +01:00
Laurent Destailleur
d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
 2016-02-20 04:25:39 +01:00
Laurent Destailleur
277d92af75 Secure migration for people using a RC 2016-02-20 03:14:29 +01:00
Laurent Destailleur
7ff8c2c3db FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:31:42 +01:00
Laurent Destailleur
266fb14a2c FIX Missing carriage return when phone is into property ->phone 2016-02-20 02:19:18 +01:00
phf
b7d99271f8 New add multicurrency on supplier order 2016-02-19 22:25:59 +01:00
Laurent Destailleur
7765e37101 Better support of option SOCIETE_SORT_ON_TYPEENT 2016-02-19 21:09:36 +01:00
Laurent Destailleur
82f57b2ccf Better position for modules 2016-02-19 20:05:25 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
Laurent Destailleur
00657d3bbe Fix sql forging error 2016-02-19 19:11:54 +01:00
BENKE Charlie
8349446340 No segment defined is not an error 
This is a proposition of correction on all ODT file
If we don't define table of segment on odt we have an error
But in some case we don't want an table on ODT
 2016-02-19 10:59:50 +01:00
aspangaro
d77a8bddcf Fixed: Members - Problem of tab & missing language file 2016-02-19 07:39:14 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
761ad0114c Merge pull request #4641 from atm-ph/new_add_multicurrency_supplier_proposal_order 
New add multicurrency on supplier proposal/order
 2016-02-19 03:36:23 +01:00
Laurent Destailleur
3b5ce32cb0 Code comment 2016-02-19 01:47:00 +01:00
Laurent Destailleur
bd80249580 Fix code comment 2016-02-19 01:45:52 +01:00
Laurent Destailleur
52c82508e4 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/compta/charges/index.php
 2016-02-18 23:27:57 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
Laurent Destailleur
5d2c189e0e Fix bad place of table 2016-02-17 23:45:25 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may 
be module is disabed). I replace with a message to choose list.
 2016-02-17 22:33:02 +01:00
phf
e24a35b904 New add multicurrency on supplier proposal/order 2016-02-16 23:58:21 +01:00
Laurent Destailleur
5268038e00 Minor css enhancement 2016-02-16 22:58:24 +01:00
Laurent Destailleur
14fb2c914a Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:41:55 +01:00
Laurent Destailleur
5fb8068374 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-16 15:39:21 +01:00
Laurent Destailleur
060b59ac6c Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:38:24 +01:00
Laurent Destailleur
e0a0817123 Merge pull request #4623 from IonAgorria/dynamic-price-changes 
Dynamic price corretions/changes
 2016-02-16 15:11:02 +01:00
Laurent Destailleur
9d418bca7f Merge branch 'new_add_customer_multicurrency_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-16 15:06:39 +01:00
Laurent Destailleur
d8e173af03 Fix regression (class not found, css on hover broken) with try to manage 
contrast on categories.
 2016-02-16 15:01:28 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
Regis Houssin
d55ac472c3 Fix: issue when bank module is disabled 
Fix: missing entity filter for lines of payment
 2016-02-16 11:27:58 +01:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00
Laurent Destailleur
d715345c82 Debug 2016-02-15 15:07:57 +01:00
aspangaro
a8ead1d44c Merge remote-tracking branch 'Upstream/3.9' into 3.9-p11 
Correct conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-15 06:31:34 +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
Laurent Destailleur
1cf2b1b3af Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-15 01:19:57 +01:00
Laurent Destailleur
fdea892e3b Merge pull request #4220 from bafbes/patch-11 
NEW Can change customer on orders when hidden option COMMANDE_CHANGE_THIRDPARTY is on
 2016-02-15 01:14:08 +01:00
Laurent Destailleur
4d4a35c93f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-02-15 00:46:20 +01:00
Laurent Destailleur
e8bc88fffe Merge branch 'new_recurring_invoice' of 
https://github.com/atm-ph/dolibarr into atm-ph-new_recurring_invoice

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:45:39 +01:00