Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

559 Commits

Author SHA1 Message Date
Laurent Destailleur
ff9312c96a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/class/ligneprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/line.php
 2020-06-08 20:36:54 +02:00
Laurent Destailleur
cf976a2b98 Fix translation 2020-06-08 17:00:58 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
e5fc928fda
add new rule 2020-05-21 02:02:54 +02:00
Laurent Destailleur
ebe169b9ef Fix objects used for profit calculation. 2020-05-05 20:51:29 +02:00
Laurent Destailleur
b54e3fb18c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-13 14:39:10 +02:00
Laurent Destailleur
1c6faf79a9 FIX #13595 2020-04-13 14:23:57 +02:00
Laurent Destailleur
eeb219cb55
Revert "NEW sorting elements on project overview" 2020-03-06 14:52:29 +01:00
Tobias Sekan
eceaf5b321
Fix Travis CI error 2020-03-06 12:09:50 +01:00
Tobias Sekan
8c115a07b0
Fix lint errors 2020-03-06 11:49:49 +01:00
stickler-ci
03b8c86c06 Fixing style errors. 2020-03-06 10:45:35 +00:00
Tobias Sekan
acd7366d64
fix not working unlink 2020-03-06 11:33:42 +01:00
Tobias Sekan
3e58cc4c02
Fix build errors 2020-03-06 11:25:02 +01:00
Tobias Sekan
05e76ba122
Fix wrong merge (new MRP things was missing) 2020-03-06 10:21:34 +00:00
Tobias Sekan
a155409bc2
Add sorting for project overview columns 2020-03-05 14:16:56 +01:00
Frédéric FRANCE
327b827fb4 avoid warning if not an array 
Conflicts:
	htdocs/projet/element.php
 2020-02-21 18:01:04 +01:00
Frédéric FRANCE
4801117c37
avoid warning if not an array 2020-02-21 09:24:24 +01:00
Laurent Destailleur
7b4c674bdc Fix css 2020-02-17 21:43:53 +01:00
Laurent Destailleur
1d760f0e42 Add MO in project overwiew 2020-02-17 21:24:59 +01:00
Scrutinizer Auto-Fixer
011803ac71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-13 11:36:05 +00:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
fc47fa5ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/projet/element.php
 2020-02-03 02:58:45 +01:00
Laurent Destailleur
8098456f67 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-03 02:52:46 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
stickler-ci
01b1667eed Fixing style errors. 2020-02-02 08:13:09 +00:00
ATM john
fe009c3842 Fix project profit for loan part 2020-02-02 09:06:02 +01:00
ATM john
e59d118b8c Fix project loan data 2020-02-02 06:36:06 +01:00
stickler-ci
1de640242f Fixing style errors. 2020-01-28 18:33:01 +00:00
kadogo
9313aabd5c NEW Add duration information for fichinter 2020-01-28 19:28:09 +01:00
Laurent Destailleur
3f79c00542
Merge branch 'develop' into actioncomm_category 2020-01-15 14:21:06 +01:00
Laurent Destailleur
0d413c47b1 Fix duplicate info 2020-01-15 13:33:11 +01:00
Laurent Destailleur
38de69f5a9 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/comm/action/list.php
	htdocs/compta/bank/releve.php
	htdocs/compta/salaries/card.php
	htdocs/core/actions_addupdatedelete.inc.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/boxes.lang
	htdocs/langs/en_US/main.lang
	htdocs/product/class/product.class.php
	htdocs/product/reassort.php
	htdocs/product/stock/product.php
	htdocs/projet/element.php
 2020-01-04 14:20:25 +01:00
Laurent Destailleur
31c5f4eb0b
Merge pull request #12748 from OPEN-DSI/v10-fix-projet-element-linkto 
FIX remove backward compatibility projectid and uses object id instead
 2019-12-31 17:40:01 +01:00
VESSILLER
792096ad08 FIX url new for task time spent in project element tab 2019-12-23 16:00:35 +01:00
VESSILLER
99e63ad507 FIX uses GETPOSTISSET instead of GETPOST for projectfield 2019-12-23 15:18:45 +01:00
VESSILLER
e7a5d26355 FIX remove backward compatibility projectid and uses object id instead 2019-12-23 14:25:54 +01:00
Frédéric FRANCE
a3e092b227
Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-14 09:21:26 +01:00
Frédéric FRANCE
446c66da62
use class CONST 2019-11-14 08:15:39 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
VESSILLER
d28242a3c5 FIX remove backward compatibility projectid and uses object id instead 2019-10-29 16:40:47 +01:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
412e0f193b
Update element.php 2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php 2019-09-27 12:36:15 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent De Coninck
b4f31d61fa allow to remove one custom referent in the project. 
Allow to remove one custom referent from the project.

When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.

This fix support now the property 'project_field'. And thus set this
column to null.

[see: #11881]
 2019-09-23 17:46:54 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
Laurent Destailleur
559a902405 FIX summary of time spent in preview tab of projects 2019-07-23 03:39:35 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
1b4507f07d Fix on a hidden option 2019-07-02 11:40:05 +02:00
Laurent Destailleur
def94b55c0 CSS 2019-06-25 13:02:11 +02:00
Laurent Destailleur
b275160f20 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-27 13:26:12 +02:00
Laurent Destailleur
143cbec281 Fix test 2019-04-26 13:23:33 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
cd6a0bacdd Look and feel v10 2019-03-22 14:32:15 +01:00
Laurent Destailleur
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
 2019-03-18 10:23:14 +01:00
Laurent Destailleur
34034787af FIX problem with sign of various payment in project preview 2019-03-18 10:16:08 +01:00
Laurent Destailleur
227f5f8f92 Code is cleaner 2019-03-18 09:08:53 +01:00
Alexandre SPANGARO
350f77db2b FIX: Error with various & salary payment on project 2019-03-17 23:00:13 +01:00
Laurent Destailleur
b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
 2019-03-09 01:20:13 +01:00
Laurent Destailleur
d88fc8cf91 Fix bad link 2019-03-07 17:32:10 +01:00
Frédéric FRANCE
ec956e1c72
replace html code by html5 in project 2019-02-23 22:24:26 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
af36883d72 update with html5 compliant code 2019-01-21 10:04:43 +01:00
Laurent Destailleur
0f2406c202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 10:55:28 +01:00
Laurent Destailleur
e0d11edb6b FIX Sql error on filter of project preview with date 2019-01-13 14:09:40 +01:00
Laurent Destailleur
a9a191819f Work on billing time spent 2018-12-06 21:25:28 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
4ef0d2ce82
Merge branch 'develop' into 8.0_dict 2018-10-30 12:26:37 +01:00
Regis Houssin
6e2d62bea6 FIX wrong entity id 2018-10-29 12:30:36 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
461bd76f70 Fix customer and supplier code name 
Fix bill time flag must be visible only if option on
 2018-10-26 23:27:29 +02:00
Laurent Destailleur
d3893b8b95 Debug v9 2018-10-26 19:00:24 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
6a6a8ae14b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-19 14:29:22 +02:00
Laurent Destailleur
5a1a5548df Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/discount.class.php
	htdocs/core/lib/payments.lib.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/societe/class/societe.class.php
 2018-10-19 14:27:15 +02:00
Maxime Kohlhaas
dfe239bf8d Fix refused proposals were counted in totals in project overview 2018-10-15 16:58:53 +02:00
Maxime Kohlhaas
320ca3db67
Fix request on project overview 
Fixes #9220
 2018-10-06 22:53:28 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Laurent Destailleur
824b572bd0 FIX Amount when using mutlicurrency on PDF 
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2018-09-19 15:03:24 +02:00
Laurent Destailleur
9b190d2cbc
Merge pull request #9201 from atm-quentin/FIX_select_element 
FIX exclude element of the select
 2018-09-19 14:55:31 +02:00
Frédéric FRANCE
4a7ea33008
replace select_date 2018-09-09 08:02:26 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
203c925c5b Fix look and feel v8 2018-09-04 12:03:21 +02:00
Laurent Destailleur
8c2eac4c93 FIX #9317 2018-09-04 11:34:23 +02:00
atm-quentin
ec9eeb5201 FIX check !empty exclude select element 2018-08-27 10:17:18 +02:00
Laurent Destailleur
7a35b560a6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-23 19:51:52 +02:00
Laurent Destailleur
499d93b8c4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/projet/class/task.class.php
	htdocs/projet/tasks/task.php
 2018-08-23 19:50:58 +02:00
Philippe GRAND
57f51fda3e Standardize 2018-08-15 12:48:13 +02:00
atm-quentin
09dfcc6016 FIX exclude element of the select 2018-08-03 14:54:21 +02:00
Laurent Destailleur
b01f07efda
Merge branch 'develop' into FIX_project_overview 2018-08-02 18:43:55 +02:00
Alexandre SPANGARO
ee61a88540 Small fix 2018-08-01 07:46:17 +02:00
Alexandre SPANGARO
b0e2e69ed0 New : Add project on salaries 2018-07-31 07:45:03 +02:00
atm-quentin
1297470c99 FIX project overview (can use any fields as fk_projet) 2018-07-26 15:05:32 +02:00
Frédéric FRANCE
622c394283
loadlangs 2018-05-26 21:11:25 +02:00
ATM-Nicolas
a455f60c42 FIX : Add calls to fetchComments function 2018-05-22 16:07:32 +02:00
Laurent Destailleur
a450f99e8a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/filefunc.inc.php
 2018-05-18 11:38:11 +02:00
florian HENRY
630e38072b fix SQL and add hook 2018-05-15 17:02:54 +02:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
Laurent Destailleur
a4384b1921 Fix date start/end of project are day not hours 2018-02-15 02:02:32 +01:00
Laurent Destailleur
742079cfe3 Clean code 2018-02-01 19:15:50 +01:00
Laurent Destailleur
d4e15545b4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-01-26 12:10:13 +01:00
Laurent Destailleur
1834be79a0 Fix supplier suggested when creating order from project overview 2018-01-26 11:31:34 +01:00
Laurent Destailleur
f93ecc1584 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
	htdocs/projet/activity/perweek.php
	htdocs/projet/element.php
 2017-10-10 11:24:17 +02:00
Laurent Destailleur
d808add499 FIX #7567 2017-10-06 15:48:48 +02:00
Laurent Destailleur
91d303465d NEW Can add html content on right of tabs 2017-09-24 01:39:06 +02:00
Laurent Destailleur
23604a2b54 NEW Add hidden option PROJECT_DISABLE_UNLINK_FROM_OVERVIEW 2017-09-21 11:54:37 +02:00
Laurent Destailleur
dcc9cb4a16 Some fixes in various payment 2017-09-11 14:29:27 +02:00
Alexandre SPANGARO
84fcbb724e Add project on various_payment 2017-09-01 07:21:27 +02:00
Laurent Destailleur
8b82fc3c70 Fix project edition on loan menu 
Fix translation on profit view of projects.
 2017-07-29 00:28:41 +02:00
absnc
7b784a1dcb Enable shipments for project overview tab 2017-05-19 17:50:10 +11:00
Laurent Destailleur
ff2a268831 NEW Architecture to manage search criteria persistance (using 
save_lastsearch_values=1 on exit links and restore_lastsearch_values=1
in entry links)
 2017-05-19 00:52:13 +02:00
Laurent Destailleur
a36a9fab2f Look and feel v6 2017-05-18 12:12:36 +02:00
alexis portable
ae57395562 NEW get amount base on thm for ficheinter 2017-05-09 22:37:17 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
a61543dedc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-04-06 21:59:41 +02:00
Laurent Destailleur
e2ea5945dd Work on look and feel v6 2017-04-06 21:48:28 +02:00
delcroix Patrick
422bdd1ef6 FIX: Supplier is not the project customer 2017-04-04 09:06:29 +02:00
Laurent Destailleur
53a04703d6 Uniformize code 2017-03-23 16:10:38 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
ee8112dde7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/projet/class/project.class.php
 2017-03-21 19:20:14 +01:00
Laurent Destailleur
61031f1633 FIX Missing total on project overview. 2017-03-21 19:10:43 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
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
Marcos García de La Fuente
7cc1288bb2 FIX #4743 UI glitch in project summary page 
Close #4743
 2016-04-09 22:54:34 +02:00
Laurent Destailleur
5101c96223 Restore button to create object from the project view. 2016-04-04 15:25:08 +02:00
Juanjo Menent
75eb718c01 Merge pull request #4922 from atm-alexis/NEW_multientity_for_project 
FIX multicompany project access
 2016-04-03 16:13:24 +02:00
Laurent Destailleur
97b5026ad8 Uniformize code and css 2016-04-01 16:18:45 +02:00
root
b018500fd4 FIX multicompany project access 2016-03-31 14:44:18 +02:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +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
Laurent Destailleur
4d5845fce5 Prepare split of module supplier 2016-01-15 01:16:14 +01:00
philippe grand
c9d6607b04 [Qual] Uniformize code 2015-12-17 14:14:44 +01:00
Laurent Destailleur
bcadc33e31 Debug visibility on task/projects 2015-12-04 15:37:28 +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
a454e92656 Increase size of combo list 2015-11-26 00:31:12 +01:00
braito4
677cba01ce Part solution bug #4095 
It allow us to deactivate the link to a project queries to lower the page workload.
 2015-11-25 18:58:47 +01:00
Laurent Destailleur
c0c0cc2415 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/interventions.lang
	htdocs/theme/md_exp/style.css.php
 2015-10-03 14:28:31 +02:00
Laurent Destailleur
60c0338d64 FIX #3628 2015-10-01 16:50:18 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
Laurent Destailleur
2c85cf246c Merge branch 'patch-1' of https://github.com/gschratzer/dolibarr into 
gschratzer-patch-1

Conflicts:
	htdocs/projet/element.php
 2015-08-31 00:45:18 +02:00
Laurent Destailleur
4377a2d013 Fix style and sql error for field fde.ref not found 2015-08-28 18:20:51 +02:00
Raphaël Doursenaud
ba1ad9f317 Fix #3219 More conventional presentation 2015-08-26 19:51:06 +02:00
Guido Schratzer
154f6cff9f Fix: htdocs/projet/element.php Logoposition 
Fixed Logo from center to right
set table width to 100 %
 2015-08-26 18:35:15 +02:00
Laurent Destailleur
72e7558356 Fix bad closing td 
Fix missing value into list of time spent
Fix typo error into constant PROJECT_TIMES_SPENT_FORMAT
Fix sql error when updating time spent into updateTimeSpent
Fix supplier orders not visible into link to
 2015-07-28 12:49:29 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
1fb40565f4 Fix bad parameters of function select_date 2015-07-12 12:50:24 +02:00
Laurent Destailleur
ae5b779652 Uniformize code 2015-06-30 01:34:17 +02:00
Laurent Destailleur
5f07c18e06 NEW Add opportunity amount on project card. 2015-06-29 16:57:32 +02:00
Laurent Destailleur
040a643ee9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/element.php
 2015-06-23 18:34:39 +02:00
Laurent Destailleur
27cc7ef2b3 Time spent 2015-06-23 10:13:08 +02:00
Laurent Destailleur
a27212644e NEW Can add project search on left menu search area 2015-06-22 11:55:21 +02:00
Laurent Destailleur
dd8a0b849a NEW If module salaries is on, you can set a hourly value for tome 
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
 2015-06-03 21:01:50 +02:00
Laurent Destailleur
a258370f8a Prepare code for generic solution where all path are forged using 
get_exdir.
 2015-05-18 22:25:51 +02:00
Laurent Destailleur
6d95de48c2 Css fixes 2015-05-14 20:49:22 +02:00
Laurent Destailleur
100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
 2015-04-22 17:57:57 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
 2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/expedition/fiche.php
 2015-04-18 23:55:17 +02:00
Laurent Destailleur
ae103e34b8 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	build/debian/changelog
	htdocs/compta/facture.php
	htdocs/core/lib/price.lib.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/opensurvey/public/studs.php
	htdocs/projet/element.php
 2015-04-13 13:08:46 +02:00
Marcos García de La Fuente
bbd01c0c8d Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project 2015-04-12 20:59:58 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
 2015-04-12 12:03:59 +02:00
Marcos García de La Fuente
5c8e92d52a Closes #2535 Bug: Untranslated string in "Linked objects" page of a project 2015-04-04 17:52:05 +02:00
Laurent Destailleur
e827b1b9cd Merge pull request #2529 from aspangaro/develop-don 
NEW better integration in project for donation module
 2015-04-02 11:42:15 +02:00
aspangaro
115777f05d New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin 2015-04-02 06:54:04 +02:00
aspangaro
d8f56eb406 New: better integration in project for donation module 
Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility
 2015-04-02 06:36:32 +02:00
aspangaro
4918326958 Fixed: Wrong path to don.class in element project 2015-04-01 08:13:10 +02:00
aspangaro
b60f1e33d6 Debug 2015-03-26 06:29:16 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/compta/bank/account.php
 2015-03-24 05:28:57 +01:00
Laurent Destailleur
cbadfa5075 NEW: Title of page project contains project ref and label 2015-03-23 12:44:41 +01:00
aspangaro
c9d31dab3a Move module Dons in htdocs->donations 2015-03-19 05:41:13 +01:00
aspangaro
dbeccf7653 Update work 2015-03-18 21:56:00 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Raphaël Doursenaud
f8dfa61859 FIXED #1901: Inverted supplier order/invoice buttons in project referring objects 2015-03-09 16:20:51 +01:00
frederic34
4af26c119f fetch object in include file 2015-03-02 17:54:35 +01:00
Laurent Destailleur
45a90b54fe Fix: param to set id of object into url must be id everywhere (except 
company, it might be socid)
 2015-03-02 02:14:18 +01:00
Alexis Algoud
5bc3763945 fix supplier order element 2015-02-24 18:23:40 +01:00
Alexis Algoud
b4f3068141 NEW add PDF icon on linked element into project 2015-02-24 18:20:19 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
e0f86f0270 Oubli sur option PROJECT_HIDE_TASKS 2015-02-02 21:33:09 +01:00
Laurent Destailleur
b36e40ee4c Fix feature to break by email 2015-02-02 21:12:43 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
5306220e5e Fixed: Translation 2015-01-23 02:21:43 +01:00
Laurent Destailleur
71a8f97c89 Optimize code 2015-01-23 02:11:10 +01:00