Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

1164 Commits

Author SHA1 Message Date
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
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
c6755b3cf1 Fix formatting of number in quantity field 2019-01-29 15:59:41 +01:00
Pierre Ardoin
80cfe86508 Update objectline_view.tpl.php 2019-01-29 14:26:14 +01:00
Pierre Ardoin
5ea1cf0775 Update objectline_edit.tpl.php 2019-01-29 14:25:34 +01:00
Pierre Ardoin
dd0f6b3829 Edition Ligne Travaux Supplémentaires 
Correction pour permettre l'édition si la ligne n'existe pas dans une précédente situation. Permet l'édition d'une ligne si elle a été ajouté dans la situation actuelle.
 2019-01-29 11:30:14 +01:00
Pierre Ardoin
508fb5c9cb Prise en charge des Travaux supplémentaires 
Corrige la filtration lors des situations client afin de prendre en compte la possibilité d'ajouter des travaux en cours de chantier.
 2019-01-29 11:13:11 +01:00
florian HENRY
c422904b99 fix #9964 2018-12-01 16:51:40 +01:00
Laurent Destailleur
553e984465 FIX Selection of addmaindocfile is lost on error 2018-10-29 02:14:41 +01:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
 2018-10-13 14:29:51 +02:00
atm-ph
e2748953c3 Fix print extrafield date in list 2018-10-12 22:31:47 +02:00
atm-ph
4b32c8e100 Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company 2018-10-11 14:24:55 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
 2018-09-27 12:52:10 +02:00
Frédéric FRANCE
a9f7bdead6 fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Laurent Destailleur
b341cb9245 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/core/tpl/objectline_view.tpl.php
 2018-09-12 18:11:51 +02:00
atm-ph
40c79cb7cd Fix classname liencolht to linecolht 2018-09-11 17:56:11 +02:00
Laurent Destailleur
77c121b15c Merge pull request #9099 from ATM-Nicolas/7.0 
NEW Set contactCivName substitution key
 2018-07-24 18:02:21 +02:00
ATM-Nicolas
3c5998e697 FIX : Refactoring 2018-07-16 11:16:55 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
ATM-Nicolas
9d60b0a8c6 Merge branch '7.0' of github.com:Dolibarr/dolibarr into 7.0 2018-07-16 09:47:16 +02:00
ATM-Nicolas
de8fd3d12c NEW : Contact substitutions keys 2018-07-16 09:33:14 +02:00
Laurent Destailleur
e92052353d Merge pull request #9026 from inoveaconseil/FixExtrafieldResource 
Fix extrafields resource
 2018-07-15 20:13:24 +02:00
ATM-Nicolas
170a668b2b FIX : Set contactCivName substitution key 2018-07-13 11:09:56 +02:00
Inovea Conseil
d53f03b596 Update after comment 2018-07-05 09:14:36 +02:00
Laurent Destailleur
7ef6b16d31 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/step1.php
 2018-07-03 10:04:25 +02:00
Laurent Destailleur
0138b0e0b7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-03 10:01:30 +02:00
Regis Houssin
2d13b5b59d Fix: broken feature with edit in place 2018-06-29 15:57:34 +02:00
Inovea Conseil
c4513a755d Fix extrafields resource 2018-06-28 16:39:37 +02:00
atm-quentin
9125586692 FIX need element type on select filter 2018-06-28 15:52:40 +02:00
Laurent Destailleur
25b1d063ae Fix length of hidden password 2018-06-24 11:45:10 +02:00
Laurent Destailleur
5829014218 Merge branch 'develop' into NEW_advance_targer_filter_everywhere 2018-06-24 10:24:26 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
atm-quentin
d53aa71673 NEW advance target filtering can be used everywhere with tpl and fk_element 2018-06-22 10:54:00 +02:00
Philippe GRAND
62586c7c5d clean and upsdate code 2018-06-18 12:47:17 +02:00
Laurent Destailleur
50aa674ebc Fix support of 'help' field property. Fix bad td closing. 2018-06-13 13:36:40 +02:00
Laurent Destailleur
f4bef82bfa Fix td not closed and js code duplicated (at wrong place) 2018-06-13 13:00:08 +02:00
Laurent Destailleur
5ea1890f0c Fix payments on contract line 2018-06-06 10:28:53 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
bgenere
89d9fe3919 FIX Issue for extra fields date display in template. 
Template is now consistent with the extrafiels_view template
 2018-05-30 17:08:01 +02:00
Laurent Destailleur
a2d485c14f Fix management of enabled property extrafields 2018-05-13 14:27:40 +02:00
Laurent Destailleur
c76e866f41 CSS 2018-05-13 14:06:57 +02:00
ATM-Nicolas
5bc9799bf1 FIX : Drag and drop lines with extrafields 2018-05-07 16:30:22 +02:00
Abbes Bahfir
17b8de2cdd New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED 2018-05-05 12:57:29 +01:00
TuxGasy
12440e6a7e Do not display multicurrency cols if currency of object is same as main currency 2018-05-02 11:30:35 +02:00
Laurent Destailleur
5eb7c7ffff FIX Edit of ref_supplier in supplier invoice 2018-04-24 13:22:34 +02:00
Laurent Destailleur
c5e0838946 Set position by default to 100 2018-04-20 01:56:35 +02:00
Laurent Destailleur
99feaf5275 Fix reposition class 2018-04-19 21:33:26 +02:00
Laurent Destailleur
4dadfac74b Debug usage of the new extrafield architecture 2018-04-17 14:34:17 +02:00