2
0
forked from Wavyzz/dolibarr
Commit Graph

21986 Commits

Author SHA1 Message Date
bahfir abbes
ad21f1e293 fix:boolean values in showinputfield are 1 and 0 not 'on' and 'off' 2020-10-14 00:15:51 +01:00
bahfir abbes
4ee6cedbe6 Option d’Activation du fichier global de configuration. 2020-10-13 23:33:25 +01:00
Laurent Destailleur
d3b6ada4eb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/compta/stats/cabyprodserv.php
2020-10-13 15:08:53 +02:00
Laurent Destailleur
bc6b5d919a Better responsive 2020-10-13 10:51:51 +02:00
Laurent Destailleur
7c67dbf6d5 Better responsive 2020-10-13 10:05:47 +02:00
Florian HENRY
4bf428fbf8 Merge github.com:Dolibarr/dolibarr into dev_objectrefferent_for_BOM 2020-10-13 08:13:54 +02:00
Laurent Destailleur
66a6415230 Merge pull request #14994 from grandoc/new_branch_12_10_2020
fix : undefined index
2020-10-12 19:37:37 +02:00
Laurent Destailleur
fcd4645509 Standardize code: Property product_libelle renamed into product_label
Move common vars declaration into parent class.
2020-10-12 19:33:00 +02:00
Philippe GRAND
4da75c4251 fix : undefined index 2020-10-12 16:11:56 +02:00
Laurent Destailleur
75997bb8f5 Minor fixes 2020-10-12 14:01:15 +02:00
Florian HENRY
739de365c0 load stat_bom 2020-10-12 13:52:50 +02:00
Laurent Destailleur
726fd1b631 Merge pull request #11227 from aspangaro/10.0_intracommreport
NEW module Intracomm report
2020-10-12 13:35:58 +02:00
Laurent Destailleur
a1dd922394 Update modProduct.class.php 2020-10-12 13:04:10 +02:00
Florian HENRY
cea6eb279f add immport packaging supplier quantity 2020-10-12 11:26:09 +02:00
Laurent Destailleur
b36b9170b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-10 15:45:22 +02:00
Laurent Destailleur
437eead694 Fix bad permission 2020-10-10 15:45:04 +02:00
Laurent Destailleur
29f19d9550 Merge pull request #14964 from TobiasSekan/MoreFilterOnLeaveLog
NEW More filter for "View change logs"
2020-10-10 15:35:55 +02:00
Philippe GRAND
ba674d09d3 add some translations 2020-10-10 14:45:58 +02:00
Philippe GRAND
094dbc1265 add some translations 2020-10-10 14:38:57 +02:00
Philippe GRAND
37b6a43c5c add some translations 2020-10-10 14:30:22 +02:00
Alexandre SPANGARO
8876457b54 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-10 06:47:05 +02:00
Laurent Destailleur
cc82a15688 css 2020-10-09 18:43:24 +02:00
Laurent Destailleur
28e462e507 Debug a box with sql and performance errors 2020-10-09 16:49:23 +02:00
Alexandre SPANGARO
4dcd2bfcda Fix Travis 2020-10-09 13:58:35 +02:00
Laurent Destailleur
a23a91a4b9 Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch
NEW: Add global search for customer payments and vendor payments
2020-10-09 13:56:52 +02:00
Laurent Destailleur
a4e8773c30 Merge pull request #14973 from hregis/develop_timestamp
FIX avoid warning "Parameter must be an array or an object that implements Countable"
2020-10-09 13:55:10 +02:00
Laurent Destailleur
1239152368 Update dolgraph.class.php 2020-10-09 13:54:47 +02:00
Laurent Destailleur
b6fc33c454 Fix avoid error when we sumbit form to change page on conciliation 2020-10-09 11:13:02 +02:00
Regis Houssin
b591e6510b FIX avoid warning "Parameter must be an array" 2020-10-09 11:03:44 +02:00
Alexandre SPANGARO
b3b37dd9ee Fix sticklerCI 2020-10-09 09:32:50 +02:00
Sekan, Tobias
35fbc602ee Add global payment search 2020-10-09 09:22:26 +02:00
Alexandre SPANGARO
ca7ad35342 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-10-09 06:39:42 +02:00
Laurent Destailleur
5352eb6734 Merge pull request #14967 from hregis/develop_timestamp
FIX add default value of timestamp for avoid error
2020-10-08 19:40:59 +02:00
Laurent Destailleur
0628c92bdb Merge pull request #14960 from rabib-metroworks/import-po
NEW ADDED IMPORT TOOL FOR PO
2020-10-08 19:29:53 +02:00
Laurent Destailleur
01ab066b7b Merge pull request #14963 from atm-quentin/NEW_helper_functions
NEW helper functions for export with phpspreadsheet
2020-10-08 19:29:16 +02:00
Laurent Destailleur
e7c456f6f2 NEW Add column payment term into list of supplier invoices. 2020-10-08 19:22:21 +02:00
Laurent Destailleur
047d6f78e7 Fix status disabled of task intocombo list 2020-10-08 17:49:26 +02:00
Aurélien
b6283c1a5d Merge remote-tracking branch 'upstream/develop' into translateModLivraison2ModDelivery 2020-10-08 16:19:10 +02:00
Regis Houssin
0dc24c87b8 FIX nuke DEFAULT CURRENT_TIMESTAMP in pgsql 2020-10-08 16:16:49 +02:00
Laurent Destailleur
24d35ff9b5 CSS 2020-10-08 11:52:58 +02:00
quentin
77552c6508 Merge branch 'NEW_helper_functions' of github.com:atm-quentin/dolibarr into NEW_helper_functions 2020-10-08 10:50:08 +02:00
quentin
7591ec6cf6 FIX style 2020-10-08 10:49:29 +02:00
stickler-ci
f5b34370b6 Fixing style errors. 2020-10-08 08:34:40 +00:00
quentin
fe8d7f7f1b missing public parameter 2020-10-08 10:32:16 +02:00
Sekan, Tobias
7e3a3a4cf3 Add more filter for leave log view 2020-10-08 10:30:09 +02:00
quentin
bf97d2a50f NEW helper functions for export with phpspreadsheet 2020-10-08 10:26:30 +02:00
Laurent Destailleur
70fa262293 CSS 2020-10-08 09:30:15 +02:00
Ahmad Jamaly Rabib
40e16cc840 NEW ADDED IMPORT TOOL FOR PO
Added Purchase Order import functionality
2020-10-08 00:34:53 +06:00
Laurent Destailleur
ff739dcbd2 Increase size of small image (used by PDF) 2020-10-07 19:39:17 +02:00
Laurent Destailleur
eb41a72e27 Properties ->titre have been renamed into ->title 2020-10-07 17:41:36 +02:00