Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 05:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,916 Commits 36 Branches 190 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

1393 Commits

Author SHA1 Message Date
Florian HENRY
872c99afe9 FIX Hook resprint be printed 2016-04-12 11:35:39 +02:00
Laurent Destailleur
22bfa7a9e2 Add logs 2016-04-08 21:50:48 +02:00
Laurent Destailleur
6a4ca98ad9 Merge pull request #4908 from altatof/fix_bad_rounding 
FIX: systematic rounding causes prices to be updated without reason
 2016-04-04 00:18:18 +02:00
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +02:00
Laurent Destailleur
a36abd43fd Merge remote-tracking branch 'origin/3.9' into develop 2016-03-30 16:27:14 +02:00
Laurent Destailleur
7146a8319b FIX Each time we edit a line, we loose the unit price. 2016-03-30 16:26:34 +02:00
Christophe Battarel
024f55d461 FIX: systematic rounding causes prices to be updated without reason 2016-03-29 12:02:36 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +01:00
Marcos García de La Fuente
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
cd687f57d6 NEW Can change type of extrafields for some combinations. 2016-03-17 21:58:51 +01:00
Ion Agorria
4300ca8bdc Use isset instead of !empty in default date 2016-03-04 00:50:47 +01:00
Ion Agorria
6feaaf906c NEW: Configurable default hour and min in date start/end 2016-03-03 16:11:42 +01:00
Laurent Destailleur
c197ce31b6 NEW Add the admin info on combo of type of contact 2016-02-29 13:24:59 +01:00
Laurent Destailleur
972d95a3c6 Better translation for nature of contact 2016-02-29 13:21:09 +01:00
Laurent Destailleur
1fa94e4d6a NEW Introduce position of records into dictionnary of type of contacts 2016-02-26 15:03:07 +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
060b59ac6c Fix option MAIN_USE_HOURMIN_IN_DATE_RANGE was not supported in output 2016-02-16 15:38:24 +01:00
Laurent Destailleur
d2708a4225 Merge pull request #4475 from atm-ph/new_multicurrency_module 
New multicurrency module
 2016-02-08 14:44:49 +01:00
Laurent Destailleur
2e1011ca0c Add hidden option MAIN_CAN_HIDE_EXTRAFIELDS to disable a feature that 
seems useless.
 2016-02-06 12:29:02 +01:00
Laurent Destailleur
cb66448148 Merge pull request #4564 from atm-ph/new_feature_hidden_extrafields 
NEW feature hidden extrafields
 2016-02-05 17:22:51 +01:00
Laurent Destailleur
5a2647906e Merge pull request #4530 from defrance/patch-96 
Add hook on contacttpl
 2016-02-05 10:50:40 +01:00
phf
32c0b2a9b1 NEW add html id/class to locate value in the DOM html 2016-02-04 21:05:19 +01:00
BENKE Charlie
87c5854382 just change for rerun travis cheking 2016-02-04 16:58:19 +01:00
phf
75c4888364 NEW feature hidden extrafields 2016-02-03 22:49:43 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Laurent Destailleur
229199aaad FIX #4497 2016-02-03 01:32:50 +01:00
BENKE Charlie
324c1123e0 Update contacts.tpl.php 
if permission modules right are not in french
 2016-01-30 17:21:42 +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
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
8e933ebb2d Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 2016-01-25 19:31:35 +01:00
phf
e86ebd6799 NEW add multicurency on customer order 2016-01-23 00:38:17 +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
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
jfefe
7c4a9d140b Replace reserved keyword "Resource" by "DolResource" 
# Conflicts:
#	htdocs/resource/list.php
 2016-01-21 11:26:21 +01:00
Laurent Destailleur
988c0131d2 Fix: markRate can be 100 2016-01-21 11:20:27 +01:00
Laurent Destailleur
d396612a7c NEW: Add a new method for margin calculation. Added margin on "cost 
price" to margin on WAP price and margin on "best supplier price".
 2016-01-13 12:48:59 +01:00
Laurent Destailleur
801e2bca4b Fix #4239 2016-01-10 18:42:35 +01:00
Laurent Destailleur
cdaccf7c4b Fix: markRate can be 100 2016-01-10 18:28:50 +01:00
Laurent Destailleur
b2924885aa Fix css 2016-01-09 03:00:12 +01:00
Laurent Destailleur
d5fa91f7ba Fix several bugs in css and in jmobile usage 2016-01-02 20:48:19 +01:00
Laurent Destailleur
b179a193dd Fix param for username is $username and not $login 2015-12-21 03:01:37 +01:00