Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
87,682 Commits 37 Branches 191 Tags
1b2cea3f9fdc61e0837200043fd04e4a27dedd21
Commit Graph

77124 Commits

Author SHA1 Message Date
Laurent Destailleur
1b2cea3f9f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-07-05 13:32:10 +02:00
Laurent Destailleur
8df431f525 Look and feel v12 2020-07-05 13:30:56 +02:00
Laurent Destailleur
344098fe23 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/actions_fetchobject.inc.php
	htdocs/langs/fr_FR/contracts.lang
	htdocs/langs/fr_FR/loan.lang
	htdocs/langs/fr_FR/stocks.lang
 2020-07-05 13:01:00 +02:00
Laurent Destailleur
54a77a604c FIX Missing token 2020-07-05 12:55:08 +02:00
Laurent Destailleur
d18ce3b39e Look and feel v12 
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
 2020-07-05 12:54:42 +02:00
Laurent Destailleur
9057559ab5 Trans 2020-07-05 12:47:32 +02:00
Laurent Destailleur
c9e5536fbc FIX Missing token 2020-07-05 12:46:53 +02:00
Laurent Destailleur
176f678a85 Look and feel v12 2020-07-05 12:46:15 +02:00
Laurent Destailleur
a0d6c9ce70 Trans 2020-07-05 12:30:04 +02:00
Laurent Destailleur
93a3efac3a Fix phpcs 2020-07-04 19:26:51 +02:00
Laurent Destailleur
b726e96f4b FIX Update form erased extrafields that were hidden 2020-07-04 17:09:20 +02:00
Laurent Destailleur
1c19c97cf2 FIX missing setup of extrafields for MO 
FIX all extrafields cleared after update of one of them
FIX Update of extrafields date
FIX Update of extrafiels on draft object
FIX Sql type
Fix trans on BOM
 2020-07-04 16:14:53 +02:00
Laurent Destailleur
6a37d12bd9 Fix sql type 2020-07-04 16:10:13 +02:00
Laurent Destailleur
9912ffd555 Fix position of button 2020-07-04 13:45:28 +02:00
Laurent Destailleur
83eaddb17b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/evalmath.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/install/mysql/migration/11.0.0-12.0.0.sql
	htdocs/langs/en_US/cashdesk.lang
	htdocs/societe/class/societe.class.php
 2020-07-04 13:13:17 +02:00
Laurent Destailleur
4819e58d06 Fix trans 2020-07-04 13:04:53 +02:00
Laurent Destailleur
dd9cb8e781 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 19:27:42 +02:00
Laurent Destailleur
e256ce5c4b Debug credit transfer module 2020-07-03 19:27:23 +02:00
Laurent Destailleur
1e7daa29a5 Hide a useless option 2020-07-03 01:46:50 +02:00
Laurent Destailleur
636f1e642d Fix param of product id to switch to list of order 2020-07-03 01:31:48 +02:00
Laurent Destailleur
fce81a4bf1 Rename var and fix position of checkbox 2020-07-03 01:30:53 +02:00
Laurent Destailleur
6b3eeebe87 Merge branch 'develop' into dev-replenish 2020-07-03 01:03:35 +02:00
Laurent Destailleur
94188af270 Merge pull request #14056 from atm-quentin/NEW_filter_on_event_tab 
NEW multiselect type and date to date filter
 2020-07-03 00:57:44 +02:00
Laurent Destailleur
1f466f3846 Update company.lib.php 2020-07-03 00:57:15 +02:00
Laurent Destailleur
03aa4873d1 Merge pull request #14141 from fappels/12_fix_extrafield_html 
FIX html lost on html extrafield
 2020-07-03 00:49:31 +02:00
Laurent Destailleur
b88e159495 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
 2020-07-03 00:46:18 +02:00
Laurent Destailleur
ec98ffb492 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:40 +02:00
Laurent Destailleur
59049cd047 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-07-03 00:41:32 +02:00
Laurent Destailleur
8d8695ccd7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:41:06 +02:00
Laurent Destailleur
53c5ec51b8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-07-03 00:40:59 +02:00
oscim
ca66eac76c Update project.class.php 
Fix order of delete extra prev table of project
 2020-07-03 00:40:15 +02:00
Laurent Destailleur
f85d240dcf Merge pull request #14145 from oscim/patch-41 
Update project.class.php
 2020-07-03 00:39:45 +02:00
Laurent Destailleur
18fa4c4105 Update card.php 2020-07-03 00:38:31 +02:00
Laurent Destailleur
fd617658ef Fix syntax 2020-07-03 00:36:56 +02:00
Je2fb
b45bfd258d fix #14143 2020-07-03 00:34:50 +02:00
Tim Otte
bce0a93227 Hotfix for an error in v12 2020-07-03 00:33:54 +02:00
Laurent Destailleur
836ccfd595 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-07-03 00:32:25 +02:00
Laurent Destailleur
751174a983 Merge pull request #14156 from Tim-Otte/fix-proposals-urgent 
FIX: Hotfix for "Call to a member function getNomUrl() on null in comm/propal/card.php"
 2020-07-03 00:32:03 +02:00
Laurent Destailleur
9c504c1b3d Merge pull request #14158 from OPEN-DSI/v10-fix-societe-card-change-selected-fields 
FIX change selected fields on company card
 2020-07-03 00:30:34 +02:00
Laurent Destailleur
cae55da399 Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by 
NEW add order by lastname and firstname by default
 2020-07-03 00:29:38 +02:00
Laurent Destailleur
a08e4bdf3f Merge pull request #14163 from atm-quentin/FIX_line_reorder_rank_develop 
NEW get all child recursively
 2020-07-03 00:28:32 +02:00
Laurent Destailleur
a44f5376da Update commonobject.class.php 2020-07-03 00:27:30 +02:00
Laurent Destailleur
bc1006e875 Merge pull request #14159 from Je2fb/develop 
FIX #14143 DynamicPrice
 2020-07-03 00:25:38 +02:00
Laurent Destailleur
8109145fe3 Merge pull request #14162 from laurantines/develop 
Update list.php in Adherents
 2020-07-03 00:24:54 +02:00
Laurent Destailleur
0ea55209ae Merge pull request #14165 from ptibogxiv/patch-345 
FIX non numeric value on comm/card.php
 2020-07-03 00:24:32 +02:00
ksar
0a13e03792 FIX : Correct ModuleBuilder left menu 2020-07-03 00:21:39 +02:00
Laurent Destailleur
70b58b5755 Merge pull request #14169 from ksar-ksar/develop 
FIX : Correct ModuleBuilder left menu
 2020-07-03 00:20:59 +02:00
Laurent Destailleur
d24c6f7a81 Merge pull request #14164 from ptibogxiv/patch-344 
FIX takepos 12 hook
 2020-07-03 00:20:28 +02:00
Laurent Destailleur
91266babea Merge pull request #14170 from andreubisquerra/master 
NEW: Appearance tab in TakePOS with more visual parameters
 2020-07-03 00:19:35 +02:00
Laurent Destailleur
75409e3ed0 Merge pull request #14171 from hregis/12.0_bug 
FIX missing possibility to change entity when propal cloning
 2020-07-03 00:18:35 +02:00