Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,408 Commits 36 Branches 189 Tags
9c4ba1c5d2b51b2d25868f45c4ccfd7296b1722c
Commit Graph

19344 Commits

Author SHA1 Message Date
Laurent Destailleur
4fe942985f FIX Mandatory fields must stay mandatory if create/update submit fails 2020-01-27 22:22:59 +01:00
Laurent Destailleur
a230a0aa13 Fix url to pay 2020-01-27 21:37:52 +01:00
Laurent Destailleur
29853b5fbd Fix responsive for public interface of tickets 2020-01-27 14:01:35 +01:00
Laurent Destailleur
50d9ac0b52 Fix else if 2020-01-27 02:13:12 +01:00
Laurent Destailleur
df478dc170 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-27 01:53:49 +01:00
Laurent Destailleur
7438f92912 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/demandes.php
	htdocs/compta/tva/document.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/societe/card.php
 2020-01-27 01:50:02 +01:00
Laurent Destailleur
17ceeb6a6e Merge pull request #12729 from frederic34/patch-6 
NEW upload odt models for order
 2020-01-26 23:55:04 +01:00
Laurent Destailleur
9cd2a63752 Merge pull request #12739 from frederic34/patch-7 
NEW upload odt models for proposal
 2020-01-26 23:49:31 +01:00
Laurent Destailleur
4a5dca4a3d Fix test 2020-01-26 23:48:40 +01:00
Laurent Destailleur
d6830e0d04 Merge pull request #12818 from glafarge/patch-1 
New : Add native spellcheck to CKEditor
 2020-01-26 23:31:27 +01:00
Laurent Destailleur
fd50074b42 Update doleditor.class.php 2020-01-26 23:31:19 +01:00
Laurent Destailleur
d13e5bc90b FIX #12875 2020-01-26 23:22:47 +01:00
Laurent Destailleur
3215af9900 Merge pull request #12923 from simicar29/develop 
New: Add Hook doPreMassActions
 2020-01-26 22:32:46 +01:00
Laurent Destailleur
02f8faeeac Update massactions_pre.tpl.php 2020-01-26 22:32:37 +01:00
Laurent Destailleur
627fa996a3 Merge pull request #12922 from simicar29/simicar29-patch-2 
Update "submitted only" module options
 2020-01-26 22:27:54 +01:00
Laurent Destailleur
8ff19a2a0f WIP search component 2020-01-26 22:02:31 +01:00
Laurent Destailleur
30a5ab479f Can choose text to show when there is no data 2020-01-25 22:43:24 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
06731bdd59 Fix phpcs 2020-01-25 14:40:16 +01:00
Laurent Destailleur
f2771b3365 FIX #12896 2020-01-25 14:23:23 +01:00
Laurent Destailleur
09f809f347 FIX #12913 2020-01-25 14:03:24 +01:00
Laurent Destailleur
09e707b818 trans 2020-01-25 13:05:40 +01:00
Laurent Destailleur
08d8670bb3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/class/product.class.php
 2020-01-24 20:12:27 +01:00
Laurent Destailleur
8f3f34e1c0 Fix css 2020-01-24 20:11:07 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
gauthier
4222639702 FIX : Extrafield position in export field list must respect "pos" field 2020-01-24 15:32:59 +01:00
Laurent Destailleur
779cd94b0e Debug cashfence feature 2020-01-24 15:26:18 +01:00
stickler-ci
cfa67b6a5d Fixing style errors. 2020-01-24 08:47:11 +00:00
simicar29
4761671fc8 Add Hook doPreMassActions 
Add Hook doPreMassActions to allow dedicated form display for custom mass actions
 2020-01-24 09:41:22 +01:00
simicar29
65cc1202ce Update "submitted only" module options 
Don't update to the null value options absent from the posted parameters.
 2020-01-24 09:23:08 +01:00
Laurent Destailleur
540713510e Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 21:03:15 +01:00
Laurent Destailleur
12b4909c45 Fix load of segment prices not required for virtual stock change 
virtual stock must include production (WIP)
 2020-01-23 20:59:18 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
b3bbb23dae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:38:14 +01:00
Laurent Destailleur
8030558117 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/class/smtps.class.php
 2020-01-23 17:34:40 +01:00
Laurent Destailleur
42769e2e7d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-01-23 17:30:30 +01:00
Laurent Destailleur
7ee37ddd3f FIX Error in log for email sending with smtps was not complete 2020-01-23 17:30:05 +01:00
Laurent Destailleur
7ad827f212 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2020-01-23 12:09:01 +01:00
Laurent Destailleur
be344518c4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/core/lib/functions2.lib.php
 2020-01-23 12:07:17 +01:00
Laurent Destailleur
cbe396b97c Update functions2.lib.php 2020-01-23 12:04:14 +01:00
Laurent Destailleur
1487158082 Update functions2.lib.php 2020-01-23 12:02:29 +01:00
Alexandre SPANGARO
7f47b48559 Move function to functions2.lib.php 2020-01-23 11:47:30 +01:00
Laurent Destailleur
41577714ce Add link to pay online into sponge template. 2020-01-23 11:25:08 +01:00
Laurent Destailleur
298b273496 Merge branch 'develop' into patch-22 2020-01-23 11:20:24 +01:00
Laurent Destailleur
fa305a1471 Update box_factures_imp.php 2020-01-23 11:14:27 +01:00
AdrianDominik
cc96da2741 Fix: strict mode mysql compatibility 2020-01-23 10:47:52 +01:00
Alexandre SPANGARO
5eeef771fa FIX: FEC export format 2020-01-23 06:20:31 +01:00
Laurent Destailleur
040f8bef5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/societe/class/societe.class.php
 2020-01-22 16:29:04 +01:00
Laurent Destailleur
28d0b85b84 Fix phpcs 2020-01-22 14:56:19 +01:00
Laurent Destailleur
2679f057fb Doc 2020-01-22 14:40:43 +01:00