lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86,468 Commits 43 Branches 150 Tags 886 MiB
3b7f3cf76a
Commit Graph

86468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a0c013d87b Fix missing link 
Conflicts:
	htdocs/core/class/notify.class.php
 2020-04-28 19:18:31 +02:00
Laurent Destailleur
66b33573ef Fix menu 2020-04-28 18:30:38 +02:00
Laurent Destailleur
93a894df5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-28 18:08:37 +02:00
Laurent Destailleur
483935493c Fix look and feel 2020-04-28 18:08:26 +02:00
Laurent Destailleur
478bd60ad2
Merge pull request #13760 from ptibogxiv/patch-336 
FIX files download by API/entity
 2020-04-28 18:01:42 +02:00
Laurent Destailleur
6990bef6a2
Merge pull request #13764 from Tim-Otte/fixProjectTaskListStatusSearch 
Fixed project task list search
 2020-04-28 18:01:10 +02:00
Laurent Destailleur
aa9ee060d5 Look and feel v12 2020-04-28 17:34:11 +02:00
Laurent Destailleur
c22e13b138 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:27:51 +02:00
Laurent Destailleur
a8740352af FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:27:42 +02:00
Laurent Destailleur
91523b4b64 FIX Can switch from double to price type for extrafields 
Conflicts:
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
 2020-04-28 14:27:22 +02:00
Laurent Destailleur
dd3a5949c0 FIX Avoid infinite loop when a fetch is inside a compute field. 2020-04-28 14:25:07 +02:00
Laurent Destailleur
2b00ae9e92 FIX Extrafields of type price must be '' and not '0' if not defined 2020-04-28 14:22:52 +02:00
Laurent Destailleur
7a73915e92 FIX Can switch from double to price type for extrafields 2020-04-28 14:22:13 +02:00
Tim Otte
947609fc12 Minor fix 2020-04-28 12:59:15 +02:00
Tim Otte
afbd73b946
Merge pull request #3 from Dolibarr/develop 
Merging changes from Dolibarr
 2020-04-28 12:42:05 +02:00
Tim Otte
4a8173f498 Fixed search_projectstatus to allow default values 2020-04-28 12:40:10 +02:00
Laurent Destailleur
72c8397e36 css 2020-04-28 11:24:13 +02:00
stickler-ci
2cf5f12a62 Fixing style errors. 2020-04-28 07:18:45 +00:00
DEMAREST Maxime (Indelog)
740b2c9228 NEW possibilty to group payments by mode and show their subtotal 
This add two params (PAYMENTS_REPORT_GROUP_BY_MOD and
PAYMENTS_FOURN_REPORT_GROUP_BY_MOD) for payments and supplier payments
to group them by mode and get subtotals for each mode. Add the
corresponding configuration options on admin page fore each payments and
supplier payments.
 2020-04-28 09:01:00 +02:00
Alexandre SPANGARO
1f6c959b72 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:55:54 +02:00
Alexandre SPANGARO
b3efa4f793 Merge remote-tracking branch 'upstream/develop' into 12.0_a26 2020-04-28 04:45:24 +02:00
Alexandre SPANGARO
31583c9b63 NEW: Accountancy add column thirdparty on binding page 2020-04-28 04:45:06 +02:00
Laurent Destailleur
a40c2fdbfc Debug v12 2020-04-28 02:58:33 +02:00
Laurent Destailleur
fb8bdefbaa Look and feel v12 2020-04-28 02:10:26 +02:00
Laurent Destailleur
52fc149faa Fix permissions 2020-04-28 01:04:37 +02:00
ptibogxiv
9764c85ee3
FIX files download by API/entity 
TODO need more clean of this file with multicompany
 2020-04-27 19:15:17 +02:00
Laurent Destailleur
a8613661fc Fix sql 2020-04-27 19:03:04 +02:00
Laurent Destailleur
12e090eed6 Fix search in correct language 2020-04-27 18:48:35 +02:00
Laurent Destailleur
0de8cb7096 Add property shortlang 2020-04-27 18:38:11 +02:00
ATM john
41e597e739 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_add_class_unitstools 2020-04-27 17:46:22 +02:00
Laurent Destailleur
fe6fb12d18 Fix missing link 2020-04-27 17:13:23 +02:00
Laurent Destailleur
635b9bb0fe FIX #13641 2020-04-27 15:27:03 +02:00
Laurent Destailleur
6b1a1e5e58 FIX #13743 2020-04-27 15:09:27 +02:00
Laurent Destailleur
ed045b2673 FIX #13749 2020-04-27 15:04:31 +02:00
Laurent Destailleur
a1142f884d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-27 15:03:34 +02:00
Laurent Destailleur
581d4dbcd9 Look and feel v12 2020-04-27 14:39:38 +02:00
Laurent Destailleur
50d9f466d4 FIX #13749 2020-04-27 14:38:45 +02:00
Laurent Destailleur
ab188a992a
Merge pull request #13397 from aspangaro/12.0_a23 
Split supplier module into 2 modules: "Purchase order" and "Supplier invoice" module (to match customer side)
 2020-04-27 14:17:28 +02:00
stickler-ci
fdc0543b4d Fixing style errors. 2020-04-27 12:16:24 +00:00
Laurent Destailleur
1c70e49695
Merge branch 'develop' into 12.0_a23 2020-04-27 14:14:13 +02:00
Laurent Destailleur
d8ba28185a
Merge pull request #13706 from leninrivas/develop 
Cancel shipping
 2020-04-27 14:06:39 +02:00
Laurent Destailleur
17a4447ccb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-27 14:02:28 +02:00
Laurent Destailleur
ed63287797 Fix font 2020-04-27 14:02:18 +02:00
Laurent Destailleur
fe3359022a
Merge pull request #13747 from bb2a/patch-7 
Link Phone in list
 2020-04-27 13:49:30 +02:00
Laurent Destailleur
a7de160290
Merge pull request #13740 from simicar29/develop-hook-updateTotalPrice 
ADD: New hook updateTotalPrice in commonObject update_price
 2020-04-27 13:43:13 +02:00
Laurent Destailleur
10ab97944a
Merge pull request #13752 from fmarcet/10.0 
FIX: Wrong Sql on getListOfTowns api method
 2020-04-27 11:42:19 +02:00
Laurent Destailleur
84353087b2
Merge pull request #13754 from atm-gauthier/11.0_fix_elementtype_2 
FIX : Another "Access to undeclared static property: Contact::$table_…
 2020-04-27 11:42:02 +02:00
Laurent Destailleur
3c1d989c30 FIX #13751 2020-04-27 11:41:35 +02:00
gauthier
7f56c4a785 FIX : Another "Access to undeclared static property: Contact::$table_element" && "Societe::$table_element" 2020-04-27 11:18:53 +02:00
Ferran Marcet
b90a6024f5 FIX: Wrong Sql on getListOfTowns api method 2020-04-27 10:15:47 +02:00