Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
82,240 Commits 36 Branches 191 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

325 Commits

Author SHA1 Message Date
Marcos García de La Fuente
cd349ab6cc FIX #6505 Project elements page shows greyed-out links even if the option to show actions not available is disabled 
Close #6505
 2017-03-13 20:17:31 +01:00
Alexandre SPANGARO
c6c07bf9f4 New : Add project to social contributions 2017-03-12 14:32:49 +01:00
Laurent Destailleur
5033c6ea99 Add hidden constant as this is not common 2017-03-11 00:35:39 +01:00
Laurent Destailleur
eef3824f8c Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/categories.php
	htdocs/admin/dict.php
	htdocs/langs/de_DE/bills.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/bills.lang
 2017-02-21 10:34:52 +01:00
Laurent Destailleur
d883c3cd8d Fix rendering 2017-02-20 04:25:20 +01:00
Laurent Destailleur
fcbc12ce31 Merge pull request #6344 from atm-ph/new_link_movement_stock_to_project 
New link movement stock to project
 2017-02-06 20:45:04 +01:00
Laurent Destailleur
bda915c63a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-03 15:34:59 +01:00
Laurent Destailleur
b5ca8ebef9 FIX #6316 2017-02-02 03:07:40 +01:00
atm-ph
ccad6d6dde New show on project "overview" tab the informations about movements stock 2017-01-29 13:36:33 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
4c4aeba855 Fix project on loans 2017-01-07 17:54:47 +01:00
Laurent Destailleur
e9853f3cd7 Merge branch 'develop' of https://github.com/Franck-MOREAU/dolibarr into 
Franck-MOREAU-develop

Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
	htdocs/projet/element.php
 2017-01-07 17:45:05 +01:00
Laurent Destailleur
477b9c8338 Fix duplicate view of agenda/events for projects 2017-01-02 12:34:23 +01:00
Laurent Destailleur
40fa816b99 Fix missing total of timespent 2017-01-02 12:27:34 +01:00
Laurent Destailleur
1b352768c2 Fix remove debug info 2017-01-02 12:18:17 +01:00
Laurent Destailleur
064f38b89e Fix condition to show time spent on project overview 2017-01-02 12:17:27 +01:00
Laurent Destailleur
293560f9c1 Fix missing ref is object is supplier object 2016-12-22 17:41:58 +01:00
Laurent Destailleur
081d3f0814 Quick hack by adding hidden constant to solve a locking feature (how to 
add project if likned to another third on project view)
 2016-12-22 16:52:03 +01:00
Laurent Destailleur
81a3235cf6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/facture/list.php
 2016-12-03 16:01:18 +01:00
Laurent Destailleur
69b5baebc5 FIX rendering of output of estimated amount on project overview page. 2016-12-03 15:54:06 +01:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
2d7d240c86 FIX the time spent on project was not visible in its overwiew 2016-11-17 17:03:50 +01:00
florian HENRY
a251f0df51 Various fix on Loan and project link 2016-11-16 09:38:13 +01:00
Laurent Destailleur
b4c20f1b1a Fix regression in creation of invoice 
Uniformize code
 2016-11-08 11:23:40 +01:00
Laurent Destailleur
dada679110 Uniformise code 2016-10-18 12:16:12 +02:00
Laurent Destailleur
63628f6a01 Uniformize look and feel 2016-10-17 21:27:40 +02:00
Josep Lluís
89f4dbe64f Fix bug: replaced invoices in projects 
In balance whole project, don't count the total amount in replaced invoices.
In invoice details the replaced invoices are OK.
 2016-10-11 16:37:44 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
dc45776d31 FIX Date visible on project overview 2016-09-23 10:32:19 +02:00
Laurent Destailleur
039bf4aae9 Fix date 2016-09-22 19:16:29 +02:00
Laurent Destailleur
8791a9f5f1 Fix date on Purchase Orders 2016-09-22 18:47:31 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
florian HENRY
cd8585da63 fix for finche inter same problem 2016-08-10 11:54:49 +02:00
florian HENRY
d38ff5c246 FIX : create proposal from project 2016-08-10 11:34:10 +02:00
Laurent Destailleur
a2f1291f94 Fix missing supplier proposals in project overview 2016-08-09 17:28:02 +02:00
Laurent Destailleur
33d12a4492 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/admin.lang
 2016-08-05 01:15:19 +02:00
Laurent Destailleur
abbe204c97 Fix design of option PROJECT_ADD_SUBTOTAL_LINES 2016-08-03 01:42:05 +02:00
Laurent Destailleur
af09528738 NEW Add substitution key __DATE_YMD__, __DATE_DUE_YMD__, __AMOUNT__ and 
__AMOUNT_WO_TAX__ into emails templates.
 2016-07-21 20:45:30 +02:00
Juanjo Menent
c5ebb8f983 Fix bad param name to test if showing selector for suppliers 2016-07-18 18:44:05 +02:00
Laurent Destailleur
52d9bbb92b Merge pull request #5345 from atm-alexis/NEW_add_element_in_referent_list 
NEW hook in element overview for a project
 2016-07-14 23:18:01 +02:00
Laurent Destailleur
c6ab11a9e5 Fix translation 2016-07-09 15:44:03 +02:00
Laurent Destailleur
10f2d7cd67 Fix Debug and minor fixes 2016-06-20 10:54:02 +02:00
Laurent Destailleur
8356dd1080 Fix minor 2016-06-20 10:22:08 +02:00
Alexis Algoud
dc224f3c88 NEW hook in element overview 2016-06-13 16:25:27 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture 
change before the freeze)
 2016-04-23 15:37:22 +02:00
Laurent Destailleur
8d46d76f96 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:05:18 +02:00
Laurent Destailleur
e61c83d708 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/facture/paiement.php
 2016-04-12 15:03:19 +02:00