Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

17941 Commits

Author SHA1 Message Date
Frédéric FRANCE
fec67aade4 Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Frédéric FRANCE
a5fce6cca8 Update CMailFile.class.php 2019-09-30 18:25:54 +02:00
Laurent Destailleur
ecc2e8df67 Fix restore lost images 2019-09-30 17:58:31 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
b390cff172 Fix css 2019-09-30 17:22:22 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
d65af06d20 Merge pull request #11869 from atm-john/new_ticket_messaging_page 
New ticket messaging page design
 2019-09-30 15:34:35 +02:00
Laurent Destailleur
d8de78dca9 Merge pull request #11984 from fuhraih/develop 
Fix 11554 and 7533
 2019-09-30 15:31:41 +02:00
Laurent Destailleur
b28cd1bb57 Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Laurent Destailleur
bbc98c19bc Update functions.lib.php 2019-09-30 15:25:55 +02:00
Laurent Destailleur
5b582d1117 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-30 15:18:28 +02:00
Laurent Destailleur
bc1e59ee23 Merge pull request #11982 from frederic34/patch-13 
Add sendcontext to notification emails
 2019-09-30 15:18:12 +02:00
Laurent Destailleur
7dd4a829a5 Comment 2019-09-30 15:18:05 +02:00
Laurent Destailleur
0a75c0645d Merge branch 'develop' into develop_fix_land_loading 2019-09-30 15:15:12 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
64e710fc1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-29 19:22:22 +02:00
Laurent Destailleur
8acf7298b2 FIX CSS 2019-09-29 19:22:01 +02:00
Laurent Destailleur
a9f88b84d8 Merge pull request #11981 from frederic34/patch-12 
Update box_supplier_orders_awaiting_reception.php
 2019-09-29 16:26:44 +02:00
stickler-ci
103efbbe5b Fixing style errors. 2019-09-28 20:55:58 +00:00
Laurent Destailleur
2b57d486dc NEW Upgrade ACE editor to v1.4.6 2019-09-28 13:50:32 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
db32ca99c6 Fix translation and sql request 2019-09-28 12:36:09 +02:00
Frédéric FRANCE
2eaf3c0dda Add sendcontext to notification emails 2019-09-28 10:25:00 +02:00
Frédéric FRANCE
710154fb9d Update box_supplier_orders_awaiting_reception.php 2019-09-28 09:00:52 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
obrunet
3e4e64ab1a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2019-09-27 21:36:35 +02:00
ATM john
d7d5b87cf2 Fix lang loaded 2019-09-27 21:29:55 +02:00
fuhraih
40a8fe3e79 FIX #11554 Extrafields: members autosubscription formular issue 2019-09-27 21:26:06 +02:00
Laurent Destailleur
fd37a81e19 FIX #11861 2019-09-27 20:02:33 +02:00
Laurent Destailleur
981c5c877a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 20:02:08 +02:00
Laurent Destailleur
24ad67e0e1 Fix missing $conf 2019-09-27 20:01:57 +02:00
Laurent Destailleur
c0e7c558a1 Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Laurent Destailleur
a4d405c6f9 Merge pull request #11906 from OPEN-DSI/new-form-products-select-labels-units 
NEW Add units in select products lines
 2019-09-27 15:30:44 +02:00
Laurent Destailleur
66cbb4020b Merge branch 'develop' into patch-4 2019-09-27 14:46:39 +02:00
Laurent Destailleur
f5c839217a Merge pull request #11914 from fmarcet/develop 
Fix: Load invoices only if showed
 2019-09-27 14:34:16 +02:00
Laurent Destailleur
8e08636d36 Merge pull request #11922 from laudeco/feature/11880_add_custom_element_in_project_export 
[#11880] - support the referents also in the beluga export of a project
 2019-09-27 14:22:49 +02:00
Alexandre SPANGARO
4b73e09c60 Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-27 14:20:53 +02:00
Laurent Destailleur
fc59193123 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 14:11:28 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
6de173494b Merge pull request #11924 from frederic34/patch-15 
Update box_fournisseurs.php to see email
 2019-09-27 14:01:18 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
a79c4608d6 Merge pull request #11934 from atm-quentin/NEW_stock_categories 
NEW Categories/Tags are also available on warehouses
 2019-09-27 12:41:28 +02:00
Laurent Destailleur
ed99b71df4 Merge pull request #11915 from frederic34/patch-12 
Update CMailFile.class.php
 2019-09-27 12:26:55 +02:00
Laurent Destailleur
13473be6e9 Merge pull request #11923 from frederic34/patch-14 
Update box_contacts.php to see email
 2019-09-27 12:16:06 +02:00
Laurent Destailleur
138b494b98 Merge pull request #11936 from aspangaro/11.0_translation 
Translate and some fix
 2019-09-27 12:15:50 +02:00
Laurent Destailleur
0aea902681 Merge pull request #11958 from altatof/clipboard 
NEW : add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant
 2019-09-27 12:14:09 +02:00
Laurent Destailleur
881c90ab74 Merge pull request #11953 from grandoc/new_branch_24_09_2019 
add missing translation
 2019-09-27 11:56:01 +02:00
Laurent Destailleur
f96c9c3bb5 FIX #11931 #11963 2019-09-27 11:51:34 +02:00