Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 23:11:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
79,034 Commits 36 Branches 190 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

1430 Commits

Author SHA1 Message Date
Laurent Destailleur
2b5e25188c Merge pull request #10977 from IonAgorria/resources-product 
NEW: Resources tab possible in products/services
 2019-04-08 13:57:30 +02:00
Ion
b64cb4129f Add resources tab for products/services 2019-04-07 23:52:49 +02:00
atm-ph
285e60e9f1 Fix default filter 2019-04-05 10:57:50 +02:00
Laurent Destailleur
8fe1be1a67 Removed deprecated use of string in dol_print_date(). Only date allowed. 2019-04-01 19:27:34 +02:00
Laurent Destailleur
d572a9258c Merge branch 'develop' into new_evol_time_spent_views 2019-03-31 19:12:27 +02:00
Laurent Destailleur
26e3f41f73 Translation 2019-03-29 16:18:47 +01:00
atm-ph
fa41eeec7f New evol "Input per week" display 2019-03-21 14:21:29 +01:00
Laurent Destailleur
d44be341a5 NEW Add property 'noteditable' in modulebuilder 2019-03-17 01:45:46 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
8f65ee2296 Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode 2019-03-14 17:48:44 +01:00
Laurent Destailleur
fe6b682ec0 NEW Add visibility with value 4 in framework to define fields to show on 
forms and list but not on creation forms.
 2019-03-12 17:45:19 +01:00
Laurent Destailleur
ddc52b7199 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/exports/export.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2019-03-07 14:13:38 +01:00
Laurent Destailleur
02b8bc94e7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-07 14:06:31 +01:00
Laurent Destailleur
0349f9bfaa Update objectline_create.tpl.php 2019-03-07 13:26:25 +01:00
Christophe Battarel
96b8da0d62 fix supllier discount 2019-03-06 22:04:01 +01:00
Laurent Destailleur
1ab3949e9c Optimize js code 2019-03-06 13:01:01 +01:00
Laurent Destailleur
7d37b4c46d CSS 2019-03-05 13:04:54 +01:00
Frédéric FRANCE
b5def5fd59 Update admin_extrafields_view.tpl.php 2019-03-02 18:11:47 +01:00
atm-quentin
e39f85ac4d FIX js focusing 2019-02-27 09:23:39 +01:00
atm-quentin
72dc25552a FIX better placement 2019-02-27 09:23:31 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Frédéric FRANCE
51b29f2ed5 replace html code by html5 in tpl 2019-02-23 22:43:53 +01:00
Frédéric FRANCE
0255336549 fix html5 user 2019-02-16 10:29:15 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2019-02-08 10:22:36 +01:00
Marc de Lima Lucio
428efa9227 FIX: line edit template: keep fk_parent_line 2019-02-05 12:02:49 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921 Merge pull request #10481 from frederic34/psr2forloop 
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
 2019-02-03 19:11:07 +01:00
Frédéric FRANCE
273d68381c psr2 end file new line none found 2019-02-03 15:21:21 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
f5b2cf75f2 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
a0c0b377b2 css 2019-01-31 20:53:47 +01:00
Frédéric FRANCE
b766204690 wip 2019-01-30 22:53:47 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
 2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5 Merge pull request #10446 from mapiolca/8.0 
Fix #10317 et #10318
 2019-01-30 16:43:14 +01:00
Laurent Destailleur
e72d6c50e6 Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
6d3529b606 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-30 14:47:28 +01:00
Laurent Destailleur
340412ed00 FIX generation of document for supplie rinvoice 2019-01-30 14:07:50 +01:00
Laurent Destailleur
f955f3f4ee Fix report error only if return code < 0 2019-01-30 12:23:34 +01:00
Laurent Destailleur
cedf1bb269 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-01-29 19:13:57 +01:00
Laurent Destailleur
205b7f2e95 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-29 19:04:40 +01:00
Laurent Destailleur
c6755b3cf1 Fix formatting of number in quantity field 2019-01-29 15:59:41 +01:00