lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,848 Commits 43 Branches 150 Tags 886 MiB
f8b0e535fa
Commit Graph

5398 Commits

Author SHA1 Message Date
Frédéric FRANCE
d986909109
loadlangs 2018-05-26 23:52:52 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
Frédéric FRANCE
f24a6ed4d6
loadlangs 2018-05-26 19:03:41 +02:00
Laurent Destailleur
182abfdb5b Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/societe/card.php
 2018-05-25 15:02:24 +02:00
Laurent Destailleur
943d1dce2e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-05-25 13:15:38 +02:00
Laurent Destailleur
8a64ee2297 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/compta/facture/card.php
	htdocs/compta/facture/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/list.php
	htdocs/societe/card.php
 2018-05-25 13:14:58 +02:00
Laurent Destailleur
823936ef87
Merge pull request #8847 from frederic34/multipriceqty 
NEW Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
 2018-05-25 12:55:02 +02:00
Laurent Destailleur
7f77f1bd5a
Merge pull request #8825 from atm-florian/develop_advtrgtml 
new : add adv targt emailing amdin with main feature level 1
 2018-05-25 11:10:51 +02:00
Laurent Destailleur
973384604e
Merge pull request #8850 from grandoc/new_branch_24_05_2018 
clean and update code
 2018-05-25 10:45:39 +02:00
Günter Lukas
3adfce35e2
Update card.php 2018-05-24 13:32:13 +02:00
Günter Lukas
1b237a75b9
Update card.php 2018-05-24 13:31:23 +02:00
Laurent Destailleur
e51aa68284 Fix link to warehouses for events 2018-05-24 12:16:04 +02:00
Philippe GRAND
11b63325bf clean and update code 2018-05-24 10:48:03 +02:00
atm-quentin
eb224e43a5 FIX missing filters during ordering 2018-05-24 10:41:24 +02:00
Frédéric FRANCE
8547827575
Merge remote-tracking branch 'upstream/develop' into multipriceqty 2018-05-23 17:06:02 +02:00
Frédéric FRANCE
efbb053e54
PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES 2018-05-23 17:05:08 +02:00
Neil Orley
15e02c7082 NEW : adds billing contacts ids to REST API returns 
adds billing contacts ids to REST API returns for proposals, orders and invoices
 2018-05-22 11:40:32 +02:00
florian HENRY
22cdbffb0a new : add adv targt emailing amdin with main feature level 1 2018-05-21 10:58:16 +02:00
Laurent Destailleur
c9d23d3930
Merge pull request #8783 from grandoc/new_branch_12_05_2018 
Clean and update code
 2018-05-18 08:56:06 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element 
Add propals lines inport on invoices.
 2018-05-18 08:55:29 +02:00
Laurent Destailleur
67ed1e0841 Fix filter criteria when using backto for events 2018-05-16 20:59:45 +02:00
Laurent Destailleur
133e736801 Fix save code 2018-05-16 20:52:45 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Laurent Destailleur
63ed5dcccc Fix securekey for new online payment form 2018-05-12 11:23:40 +02:00
Philippe GRAND
29c735d8bd Clean and update code 2018-05-12 10:46:17 +02:00
atm-john
6b2dfa0528 Extend lines import to propal 2018-05-10 21:06:18 +02:00
Ferran Marcet
70527e64c5 New: Add Date delivery and Availability on Propals List 2018-05-08 18:15:02 +02:00
Laurent Destailleur
86697c58d8
Merge pull request #8712 from atm-quentin/develop_categ_filter 
NEW thirdparty categ filter on lists
 2018-05-05 12:56:27 +02:00
atm-quentin
21b387a4c4 NEW thirdparty categ filter on lists 2018-05-02 15:01:32 +02:00
ATM-Nicolas
73c3529831 NEW : Display price HT on all commercial area boards 2018-05-02 14:36:55 +02:00
Laurent Destailleur
3374c50e2d CSS 2018-05-01 10:42:09 +02:00
Laurent Destailleur
32ace6a8cf NEW Add hook setContentSecurityPolicy 2018-04-30 15:17:38 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Regis Houssin
2906358383 Fix: use "socpeople" instead "societe" 2018-04-27 10:42:10 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
46e448a086 Fix default agenda view 2018-04-22 17:57:20 +02:00
Laurent Destailleur
912d5c53f2 Standardize code 2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb Optimize constructors 2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e FIX key in getEntity for supplier proposals 2018-04-21 14:41:31 +02:00
Laurent Destailleur
c81c744aaf Clean deprecated var 2018-04-21 13:14:58 +02:00
Laurent Destailleur
ccd9aa8059 Fight against dolibarr warnings 2018-04-21 12:16:12 +02:00
Laurent Destailleur
38d200d8a6 Fix left menu 2018-04-20 13:23:34 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
florian HENRY
ad403c7045 fix syntax and uniformize code 2018-04-14 17:04:38 +02:00
Laurent Destailleur
86112f0096 Syntax error 2018-04-13 14:15:33 +02:00
Laurent Destailleur
d4cd5a0d95 Fix syntax error 2018-04-13 13:37:43 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
4d94327ead Look and feel v8 2018-04-07 16:17:40 +02:00
Laurent Destailleur
d46a8eb8f0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/company.php
 2018-04-07 12:30:30 +02:00
Laurent Destailleur
ee870342ef Fix navigation/translation 2018-04-06 20:22:20 +02:00
Laurent Destailleur
1009a629d9 Try better Fix for #8432 2018-04-06 13:20:09 +02:00
Laurent Destailleur
2207e5e470 Fix tooltip 2018-04-05 19:23:36 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Marc de Lima Lucio
c2d3e2a701 NEW: generalize button to create object from list, for the remaining lists 2018-04-03 15:28:12 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Laurent Destailleur
b6e9e0e287 Fix missing hooks 2018-03-30 16:44:58 +02:00
Laurent Destailleur
6ccdb52229 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-29 13:30:22 +02:00
Laurent Destailleur
072b6c02c0 FIX Test on mandatory status when closing proposal failed 2018-03-29 13:25:03 +02:00
Laurent Destailleur
b806b85761 Fix field filtert is set twice 2018-03-29 11:15:50 +02:00
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
630ed04e17 FIX missing properties in last contract list 2018-03-24 13:15:00 +01:00
Laurent Destailleur
6e52c896f2 Dolibarrize module ticket 2018-03-22 10:46:42 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
e639f2a91f Removed deprecated method classer_facturee(). Duplicate of 
classifyBilled
 2018-03-16 10:51:12 +01:00
Laurent Destailleur
c962b89495 NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull 2018-03-15 20:46:55 +01:00
Laurent Destailleur
620ceb54e3 Clean code to avoid confusion 2018-03-15 14:25:09 +01:00
Laurent Destailleur
0258d3aeeb Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-13 18:04:59 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response 
the fk_element don't display when the call is made with REST API (reason non found)
 2018-03-13 10:28:44 +01:00
Laurent Destailleur
78b0585798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/taxes.php
 2018-03-12 19:09:57 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
a3d25b24d3 FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id} 2018-03-11 19:27:03 +01:00
Laurent Destailleur
4070d78d13 Fix phpcs 2018-03-11 02:18:46 +01:00
Laurent Destailleur
7f469e9f6f Fix PHPCS 2018-03-11 02:04:08 +01:00
Alexis Algoud
129c032118 NEW hidden conf to set nb weeks to show into user view 2018-03-10 16:46:57 +01:00
Laurent Destailleur
466f87ee15
Merge pull request #8322 from inoveaconseil/develop 
Add research with phone number on left search
 2018-03-10 11:20:16 +01:00
Inovea Conseil
9075ed4107
Add mass action proposal closed 2018-03-10 00:04:58 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink 
7.0 betterthirdpartylink
 2018-03-09 23:03:23 +01:00
florian HENRY
a34709c112 fix better thirdparty link 2018-03-09 22:36:00 +01:00
Regis Houssin
ea175cd6c1 Fix: compatibility with multicompany dictionnary sharing 2018-03-09 09:37:23 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm 
NEW: supplier credit notes & discounts (absolute and relative)
 2018-03-08 20:06:37 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Laurent Destailleur
7e3b118257 Standardize output 2018-03-07 12:03:40 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2018-03-07 11:54:48 +01:00
Laurent Destailleur
f800d50fec WIP to show event per hours 2018-03-07 11:53:30 +01:00
Laurent Destailleur
a0a9e12178 Fix css 2018-03-07 11:29:50 +01:00
Laurent Destailleur
1a5cc4e516 Fix in edit mode, title of event is required 2018-03-07 11:06:14 +01:00
Laurent Destailleur
f3fd5f4cfa FIX Label of event show twice 2018-03-07 11:03:35 +01:00
Laurent Destailleur
1e6a55745c CSS 2018-03-06 11:54:05 +01:00
Marc de Lima Lucio
1765b09fda Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-05 11:05:38 +01:00
Marc de Lima Lucio
6a4a3c9e82 NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL 2018-03-05 10:58:19 +01:00
Laurent Destailleur
864edce665 NEW Accept anonmymous events (no user assigned) 
NEW Online payment now record the payment on invoices
 2018-03-04 19:39:46 +01:00
Laurent Destailleur
0270e21289
Merge pull request #8242 from hregis/develop_multicompany 
Fix: use "multidir_output" instead "dir_output" (propal)
 2018-03-02 17:49:25 +01:00
Marc de Lima Lucio
451d943927 NEW: supplier credit notes: factorized discount block (+ correct translations for supplier discounts) 2018-03-02 16:48:25 +01:00
Laurent Destailleur
191a1e9350 Fix css 2018-03-02 11:18:29 +01:00
Laurent Destailleur
a3350d12d8 css 2018-03-01 23:51:06 +01:00
Laurent Destailleur
0f237e4d5c NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
Marc de Lima Lucio
059801fe03 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-03-01 10:22:21 +01:00
Laurent Destailleur
6f29a574cf CSS 2018-03-01 02:37:18 +01:00
Laurent Destailleur
f545d2a134 NEW Can add filter actiontype and notactiontype on event ical export 2018-02-28 20:06:28 +01:00
Laurent Destailleur
c8e6a8c014 Fix look and feel v7 2018-02-27 22:17:42 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Marc de Lima Lucio
7cd1b2caa9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm 2018-02-27 16:45:01 +01:00
Marc de Lima Lucio
9cf45266f5 NEW: supplier relative discounts 2018-02-27 16:30:39 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
3c552cec15 FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +01:00
Marc de Lima Lucio
7ca5ac03cc FIX: discount card: only display relevant discounts types (customer/supplier) 2018-02-26 17:40:31 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
003827eb06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-25 15:01:19 +01:00
Laurent Destailleur
502f219f7f
Merge pull request #8231 from hregis/7.0_entity 
FIX missing object entity in fetch
 2018-02-25 12:59:38 +01:00
Regis Houssin
703d976b3b Fix: missing object entity in fetch 2018-02-24 16:21:16 +01:00
Regis Houssin
b216249214 Fix: missing hook parameters 2018-02-24 15:01:29 +01:00
Laurent Destailleur
0a79550f43 Fix oldcopy must be saved before update_extras 2018-02-23 16:11:00 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
John
bd0e8506f5 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-02-21 11:53:16 +01:00
Laurent Destailleur
72c1357c9b NEW Section of files generated by mass action not visible if empty 2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra. 
Clean duplicate trigggers "*_CLONE"
 2018-02-20 18:09:38 +01:00
John
09c5dc506a Add html dom element and fix class 2018-02-20 17:46:32 +01:00
John
5624257a6d add new dom html5 elements and class 2018-02-20 16:49:49 +01:00
Marc de Lima Lucio
95be155010 FIX: supplier credit notes: harmonize discount filters 2018-02-20 12:26:29 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
fa0c65e37e FIX: supplier credit notes: correctly handle discount split 2018-02-16 12:05:36 +01:00
Marc de Lima Lucio
e2b65b3755 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_supplier_credit_note 2018-02-16 09:14:53 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
f0855da0fb Fix responsive 2018-02-15 12:57:04 +01:00
Laurent Destailleur
78697c1735 USe fk_product is better than ref 2018-02-14 21:14:24 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Laurent Destailleur
109c447171 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:37 +01:00
Romain DESCHAMPS
8e42ed5824 add missing links in cust. card boxes 2018-02-12 02:40:13 +01:00
Laurent Destailleur
eccdc9a075 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/pt_PT/companies.lang
 2018-02-08 15:20:24 +01:00
Laurent Destailleur
9c954de081 Error management 2018-02-08 14:25:44 +01:00
Laurent Destailleur
475b89bac1
Merge branch 'develop' into new_order_min_amount 2018-02-08 14:20:53 +01:00
Laurent Destailleur
b364b2a4de Fix selection of filter in agenda views 2018-02-06 01:16:51 +01:00
Laurent Destailleur
074f4a3b46 Fix class not found when selecting project ref in lists 2018-02-06 00:34:14 +01:00
Laurent Destailleur
b063c19084 Fix: object project not defined 2018-02-06 00:19:40 +01:00
Laurent Destailleur
2fbe4637ac Fix bad filter link 2018-02-05 23:05:37 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Laurent Destailleur
0e3d5ea9e5 Fix missing translation 2018-02-04 11:44:39 +01:00
Laurent Destailleur
b3df7670e9
Merge pull request #7999 from frederic34/propalweight 
NEW display weight volume in propal
 2018-02-03 16:58:58 +01:00
Laurent Destailleur
f51d6a2e50 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-02 10:07:16 +01:00