Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
56,821 Commits 36 Branches 189 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

10470 Commits

Author SHA1 Message Date
mic9p
827fd39658 Do not select siren but tva_intra from societe 
VAT report by customer shows an empty field.
 2016-01-30 10:35:57 +01:00
BENKE Charlie
d79478e66d Add hook on contacttpl 
The goal is to display additionnal feature a the bottom of the contact page like display contact adress and print stamp directly
Another way is to show on a google maps the travel to do between us and the multiple thirdpartie present
 2016-01-30 09:43:02 +01:00
Laurent Destailleur
19d119d3a4 Debug cron module. 
Task to delete temporary files older than 24 is on by default.
 2016-01-30 02:51:26 +01:00
Laurent Destailleur
1854f07e5c Move code to purge files into a dedicated utils class (cron job need 
class)
 2016-01-30 00:12:58 +01:00
Laurent Destailleur
7c2ac4b3ee NEW The probability of lead/opportunity can be defined per lead. 2016-01-28 20:04:02 +01:00
Laurent Destailleur
cd58c93de6 FIX If option to hide automatic ECM is on, dont show menu. 2016-01-28 12:51:34 +01:00
Laurent Destailleur
99b2236260 FIX Selection of project must no show closed project 2016-01-28 12:19:13 +01:00
Laurent Destailleur
c09fa6e0dd Fix empty keys are not allowed into select 2016-01-28 12:19:06 +01:00
Laurent Destailleur
df4cd3de17 FIX Selection of project must no show closed project 2016-01-28 12:05:14 +01:00
Laurent Destailleur
06bbf4c966 Fix empty keys are not allowed into select 2016-01-27 21:10:42 +01:00
phf
4baff7898d FIX insert FactureLigne 
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
 2016-01-26 22:18:31 +01:00
phf
83f90e2b1f Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/commande/card.php
 2016-01-25 21:50:43 +01:00
phf
b2b787f1ff FIX Travis 2016-01-25 21:33:14 +01:00
phf
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +01:00
Laurent Destailleur
ce02f05d43 Translation of dashboard 2016-01-25 17:18:17 +01:00
Laurent Destailleur
274caf61eb NEW Add statistics for interventions module 2016-01-25 13:34:05 +01:00
Laurent Destailleur
467dc12a7b NEW Module "Supplier commercial proposal" (price request) is set to 
stable status.
 2016-01-25 12:33:38 +01:00
Laurent Destailleur
ba833dc412 Work on CMS module 2016-01-24 21:35:41 +01:00
Laurent Destailleur
8d46a56dac Work on CMS module 2016-01-24 21:17:11 +01:00
Laurent Destailleur
c1ebdd3b4f Default url is home 2016-01-24 11:35:33 +01:00
aspangaro
73d5e7036f Refactoring eldy menu to test 2016-01-24 08:21:18 +01:00
aspangaro
e5808f876d Merge remote-tracking branch 'Upstream/3.9' into 3.9-p6 2016-01-24 07:04:20 +01:00
phf
963d0c396b FIX change rate on order/invoice do not update lines 
NEW if we change the currency on already existing propal/order/invoice the
current rate is update too then update lines
 2016-01-23 21:36:07 +01:00
Laurent Destailleur
469a44a4cf NEW Include number of linked files into badge counter of "Linked files" 
tab.
 2016-01-23 17:23:00 +01:00
Laurent Destailleur
da93e35dbb NEW Include number of linked files into badge counter of "Linked files" 
tab.
 2016-01-23 17:19:34 +01:00
phf
9376699299 FIX travis missing comment for new param 2016-01-23 16:16:15 +01:00
phf
373225272b FIX reorder the display of currency and rate on propal/order 
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
 2016-01-23 16:01:55 +01:00
Laurent Destailleur
4df584e57b Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
 2016-01-23 11:51:56 +01:00
Laurent Destailleur
dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
 2016-01-23 11:45:39 +01:00
Laurent Destailleur
dc438792f4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/fourn/commande/card.php
 2016-01-23 11:39:37 +01:00
Laurent Destailleur
9be246baa5 Merge remote-tracking branch 'origin/3.6' into 3.7 2016-01-23 11:32:06 +01:00
phf
e86ebd6799 NEW add multicurency on customer order 2016-01-23 00:38:17 +01:00
phf
21db62d645 FIX multicurrency price always display and update line price if rate is 
update
 2016-01-22 22:35:32 +01:00
Laurent Destailleur
fedf1f3288 Fix view of product image when using old path 
Fix size of image uploaded on user.
 2016-01-22 14:02:48 +01:00
Laurent Destailleur
a406334643 Merge pull request #4458 from atm-alexis/FIX_bad_pdf_refetch_erase_hook_modification 
FIX line refetch incompatible with hook practice
 2016-01-22 04:10:06 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
cbd01bae49 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/admin/dict.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/societe/index.php
 2016-01-22 03:18:51 +01:00
Laurent Destailleur
d857b3475b Fix doxygen 2016-01-22 03:07:46 +01:00
Laurent Destailleur
cc71445b45 Fix: Only one name for one same feature. 2016-01-22 02:41:51 +01:00
Laurent Destailleur
e6653ea14f Merge pull request #4333 from defrance/patch-94 
Parameters harmonization of hook call
 2016-01-22 02:35:21 +01:00
Laurent Destailleur
d2f5f5c01f Merge pull request #4266 from fappels/develop_multi_warehouse 
Add shipping and dispatching from/to multiple warehouses
 2016-01-22 02:26:25 +01:00
Laurent Destailleur
d7847a8ec8 Merge pull request #4256 from GPCsolutions/dolibarr-mysqli 
[Qual] mysqli code review
 2016-01-22 02:22:47 +01:00
Laurent Destailleur
219ce73ea2 Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook 
FIX nblignes not calculated after hook and hook can't modify this val...
 2016-01-22 02:10:36 +01:00
Laurent Destailleur
4e87afddf1 Fix: why a floating float here ? 2016-01-21 22:44:05 +01:00
Laurent Destailleur
35d9b25d82 Fix: why a floating float here ? 2016-01-21 22:43:20 +01:00
phf
68857499d7 NEW display multicurrency price on azur pdf model 2016-01-21 22:26:51 +01:00
phf
8487058c98 FIX add input multicurrency_subprice on edit line 2016-01-21 21:54:57 +01:00
phf
f7afbcff68 NEW integration of multicurrency module (creation fields in database and admin) 
NEW add multicurrency_code on create, update and fetch company object
NEW add multicurrency on propal
FIX travis
FIX back quote into sql file
 2016-01-21 21:38:52 +01:00
Laurent Destailleur
dd6e60630d Fix size of cells make page too large even for large screen 2016-01-21 15:01:53 +01:00