lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
53,200 Commits 43 Branches 150 Tags 886 MiB
d40e659b30
Commit Graph

4359 Commits

Author SHA1 Message Date
Laurent Destailleur
36474eabec NEW Add stats and late records into dashboard for supplier proposals. 2016-03-04 16:14:23 +01:00
Laurent Destailleur
c63ee8ceb5 Debug module supplier proposal 2016-03-04 16:08:51 +01:00
Ion Agorria
a1159b6f29 Fix: unset date start/end at success 2016-03-04 14:11:06 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
3b70bbb05a Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/core/lib/admin.lib.php
 2016-03-02 23:07:42 +01:00
Laurent Destailleur
2eaa21ea5c Fix minor css error (pixel size must have "px"). Compatibility with old 
behaviour.
 2016-02-29 10:50:52 +01:00
Laurent Destailleur
8807222f24 Fix a lot of fixes to have the french vat npr working better 2016-02-27 12:22:39 +01:00
Laurent Destailleur
c86a1a30d5 Fix a lot of fixes to have the french vat npr working better 2016-02-27 11:46:16 +01:00
Laurent Destailleur
93b1b4c66e FIX #4580 2016-02-21 21:02:25 +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
Ion Agorria
fc8f1272d2 Fix line fetch not converting dates 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
 2016-02-20 02:34:01 +01:00
Ion Agorria
6002897976 Fix line fetch not converting dates 2016-02-19 20:06:09 +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
b70f2f329c Fix bad position of form 2016-02-19 03:59:22 +01:00
phf
6d095fce9f Fix replace dol_include_once() function by require_once for internal module 2016-02-16 20:44:23 +01:00
Laurent Destailleur
f809800e01 Fix sql error 2016-02-16 15:36:54 +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
c85b7932a9 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-02-15 01:18:59 +01:00
Laurent Destailleur
04b390f21c Merge pull request #4507 from altatof/PROPAL_CLONE_ON_CREATE_PAGE 
FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden constant
 2016-02-14 21:59:04 +01:00
Laurent Destailleur
13c85516ee Doc comment 2016-02-14 21:58:54 +01:00
aspangaro
45cc841b92 Correct travis 2016-02-13 08:10:13 +01:00
Laurent Destailleur
94732b8ae9 NEW When emailing is not sent completely, show progression 2016-02-12 14:23:40 +01:00
Laurent Destailleur
d0ab1db19b NEW When emailing is not sent completely, show progression 2016-02-12 14:21:44 +01:00
Laurent Destailleur
2796875ed1 Can select size of list of targets of email 2016-02-12 13:58:24 +01:00
Laurent Destailleur
158906455a NEW Can change dynamically number of records visible into lists. 2016-02-11 20:40:33 +01:00
Laurent Destailleur
bc33b19d7d NEW Can change dynamically number of records visible into lists. 2016-02-11 20:24:15 +01:00
Laurent Destailleur
0d7f67ade5 Merge remote-tracking branch 'origin/3.9' into develop 2016-02-10 23:59:15 +01:00
Laurent Destailleur
e169cd3364 Fix usage of filter into selection of email members into emailing. 2016-02-10 23:48:18 +01:00
Laurent Destailleur
6dbaba6973 Fix: previous and next arrow 2016-02-10 17:45:26 +01:00
Laurent Destailleur
f640bf7c61 Manage the reply-to field into mail libs 2016-02-09 11:56:12 +01:00
Regis Houssin
0b25601307 Fix: wrong object name 2016-02-08 12:31:40 +01:00
Regis Houssin
9b10f030bf Fix: missing signature and uniformize code between card and script 2016-02-08 12:20:40 +01:00
Laurent Destailleur
c4c7ea2f22 FIX Relative discount decimals are not saved 2016-02-08 02:49:19 +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
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
5e9fd25a6e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-01-30 15:59:40 +01:00
Christophe Battarel
1baf25de3c FIX ISSUE #4506 : make working the PROPAL_CLONE_ON_CREATE_PAGE hidden 
constant
 2016-01-27 12:04:00 +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
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
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
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
Regis Houssin
2b7b7e014d Fix: for avoid conflict with "global $m" in memory.lib.php 2016-01-22 13:20:21 +01:00
Laurent Destailleur
f2f4c60dbd Merge pull request #4469 from aspangaro/3.9-p8 
Fix: Commercial index presentation - missing $var=!$var when we have no data
 2016-01-22 04:15:22 +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
phf
148a5947a7 FIX update propal line the multicurrency price do not change 2016-01-21 22:40:07 +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
aspangaro
192c58f10d Fix: Commercial index presentation - missing $var=!$var when we have no data 2016-01-21 05:44:53 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
Laurent Destailleur
7f4386f739 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-15 01:53:21 +01:00
Laurent Destailleur
cb24f2b372 Fix missing type in list 2016-01-15 01:52:16 +01:00
Laurent Destailleur
a0fc26fbd8 Fix missing orde by 2016-01-14 17:09:59 +01:00
Laurent Destailleur
524614ded9 Start to work on a per type view of agenda 2016-01-14 16:52:46 +01:00
Laurent Destailleur
b5f057051b Fix: Missing param into link 2016-01-14 15:45:05 +01:00
Laurent Destailleur
acf3f23de8 Merge remote-tracking branch 'origin/3.9' into develop 2016-01-14 14:15:44 +01:00
Laurent Destailleur
b8b84c67a6 Fix bad setting of default actioncode 2016-01-14 14:15:14 +01:00
phf
9b682e095f FIX can't clone event 2016-01-13 14:41:32 +01:00
Laurent Destailleur
7fd2cbea49 Merge pull request #4257 from defrance/patch-91 
add icalname on default event
 2016-01-12 23:41:57 +01:00
Laurent Destailleur
0a255decf8 Merge pull request #4401 from aspangaro/develop-p2 
New: #3292 Make sure each and every page displays a title
 2016-01-12 23:19:17 +01:00
aspangaro
cf6be40922 New: #3292 Make sure each and every page displays a title 2016-01-11 22:03:26 +01:00
aspangaro
3ff9fe3123 Fix: Add missing key language for propal 2016-01-09 08:26:08 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
cbe65fbc79 Fix: fields added into 3.8 to store email event was not enough. To late 
to use them. Will be done into 4.0
 2016-01-08 13:05:56 +01:00
Laurent Destailleur
4e2d4a6651 Fix: the new option AGENDA_USE_EVENT_TYPE_DEFAULT was not visible. 
Solved this by completing tooltip info.
 2016-01-07 11:01:37 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Marcos García de La Fuente
d30c64413d FIX #4055 SQL error when trying to access a non-existing expedition 2015-12-24 14:27:12 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old 
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
 2015-12-21 13:56:59 +01:00
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page 
Fix Missing translations
 2015-12-21 00:47:44 +01:00
Laurent Destailleur
d7e9c92144 Fix bad link on category 
Fix cancel button on categories
Css enhancement.
 2015-12-19 13:55:27 +01:00
BENKE Charlie
efb1e91a23 Update index.php 
i have add an icalcolor test for icalevent too and made some reindentation
 2015-12-19 10:29:56 +01:00
BENKE Charlie
dc0af179e9 add icalname on default event 
allow to manipulate it (show/hide) when we add some other calendar on main (eg fichinter calendar)
 2015-12-18 01:41:30 +01:00
Laurent Destailleur
34f4e913d4 Merge pull request #4240 from frederic34/patch-9 
Fix when PRODUIT_MULTIPRICES is set, label for each level was not visible
 2015-12-16 19:58:48 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +01:00
Laurent Destailleur
f87ccc97e2 Miscellaneous fixes 2015-12-16 19:26:50 +01:00
Frédéric FRANCE
9e6698c6ca Update multiprix.php 2015-12-16 18:18:02 +01:00
Laurent Destailleur
0ec62c05cc Fix bad var name. Removed warning. 2015-12-14 09:14:34 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
Ion Agorria
1dc5854535 Fix date handling for hours/mins in some pages 2015-12-07 03:59:03 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
e002021d7d Fix td balance 2015-12-05 17:49:08 +01:00
Laurent Destailleur
5cd43d2df0 Some debug on new features 2015-12-04 20:51:34 +01:00
Florian HENRY
955fad910d FIX : Bug: $this is not accessible in static context in 
Mailing::libStatutDest #4050
 2015-12-04 17:32:17 +01:00
Florian HENRY
ee08c4afc4 Display the ref_supplier inside the contract list of /comm/card.php 
#4090
 2015-12-03 11:03:40 +01:00
Florian HENRY
b4160c7f81 Cannot change the date of a contract #4088 2015-12-03 10:58:06 +01:00
Laurent Destailleur
c55d11869b Billing of supplier or customer order is a process that can be done in 
parallel with shipment or reception, so we show the status on another
field into lists.
 2015-11-29 15:54:32 +01:00
Laurent Destailleur
5df193ec93 Uniformize code 2015-11-28 20:25:50 +01:00
Laurent Destailleur
b47dbc7a5f Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/install/pgsql/functions/functions.sql
	htdocs/projet/element.php
 2015-11-26 01:32:21 +01:00
Laurent Destailleur
a94aedb171 Minor css fix 2015-11-22 12:33:56 +01:00
Laurent Destailleur
2a345b6fc0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
 2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
e31a8f25a2 FIX #4018 SQL error if trying to access the mailing/card.php page without an ID defined 2015-11-21 10:55:23 +01:00
Marcos García de La Fuente
2dedea8736 FIX #4016 User link is not correctly formed in emailing receivers 2015-11-20 22:03:44 +01:00
phf
c21354101f FIX can not have access to the new ids or propal lines on PROPAL_CLONE 2015-11-16 15:36:02 +01:00