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

75114 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
faf8803329
Merge pull request #10966 from atm-ph/fix_default_filter 
Fix default filter
 2019-04-08 13:48:31 +02:00
Laurent Destailleur
a7ced8ab5d
Merge pull request #10963 from aspangaro/v10_p3 
NEW: Accounting - Invert module name
 2019-04-08 13:39:51 +02:00
Laurent Destailleur
d2cbc95325
Update admin.lang 
Note that 80% of current Dolibarr users use the term "Accounting" to say "invoicing" (Definition of work accounting is not same for end users and for book keeping people). So to avoid confusion for end users and not having letting think they need this module because they ant to make accounting (with their definition), we must to be clear in name (description is not enough). So i rename "Accounting" into "Accounting (double entry)". So this is clear it is accounting with the definition of a book keeper.
 2019-04-08 13:39:22 +02:00
Laurent Destailleur
8accc894b0
Update admin.lang 2019-04-08 13:36:11 +02:00
Laurent Destailleur
2606de2119
Update modAccounting.class.php 2019-04-08 13:35:06 +02:00
Laurent Destailleur
7c91c1b9f1
Merge pull request #10962 from aspangaro/v10_p2 
FIX: Problem with badge in tab in expedition card
 2019-04-08 13:33:59 +02:00
Laurent Destailleur
976ef92df6
Merge pull request #10958 from atm-john/new_look_and_feel_pdf 
New pdf document column system : supplier order and expedition
 2019-04-08 13:31:47 +02:00
Laurent Destailleur
9a09949115
Merge pull request #10970 from cdallagnola/patch-1 
Patch 1
 2019-04-08 13:30:03 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options 
New categories options in sellist and chbxlist extrafields
 2019-04-08 13:28:51 +02:00
Laurent Destailleur
7b85a7977b
Update html.form.class.php 2019-04-08 13:28:32 +02:00
Laurent Destailleur
6f34a84a9a
Update categorie.class.php 2019-04-08 13:23:19 +02:00
Laurent Destailleur
0b69c3362d
Merge pull request #10973 from frederic34/patch-5 
php 5.5 minimum
 2019-04-08 13:19:29 +02:00
Laurent Destailleur
b527446e47 Changelog 2019-04-07 18:39:13 +02:00
Laurent Destailleur
e800c45ab8 Can edit date of last collect by email collector 2019-04-07 18:36:25 +02:00
Laurent Destailleur
22ca858b36 Enhance setup of email collector 2019-04-07 18:32:01 +02:00
Laurent Destailleur
fad2fa48dd NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
Frédéric FRANCE
60f2740a03
Update .travis.yml 2019-04-07 10:03:49 +02:00
Frédéric FRANCE
a3c6d48a02
php 5.5 minimum 2019-04-07 10:00:12 +02:00
Laurent Destailleur
56194091a9 trans 2019-04-06 13:27:38 +02:00
Laurent Destailleur
302a42a603 PHP 5.4 is no more supported. Minimum PHP is now 5.5+. 2019-04-06 13:20:26 +02:00
Laurent Destailleur
c61cbd7b15 Fix phpcs 2019-04-05 20:13:41 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
67760d6f41 Fix phpcs 2019-04-05 19:53:45 +02:00
Laurent Destailleur
997d6cca0a Fix $db not defined 2019-04-05 19:49:47 +02:00
Laurent Destailleur
b6c19e0f35 Fix var not defined 2019-04-05 19:48:32 +02:00
Laurent Destailleur
ba9cceeee5 Fix phpcs 2019-04-05 19:42:56 +02:00
Laurent Destailleur
2a9c04b1ba Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-05 19:40:22 +02:00
Laurent Destailleur
becefeebff Fix upload of files without extension 2019-04-05 19:39:49 +02:00
Laurent Destailleur
0fd1f9abf6 Show if there is no uploaded files 2019-04-05 19:39:30 +02:00
Laurent Destailleur
734b97e255 Fix upload of files without extension 2019-04-05 19:39:04 +02:00
DALL'AGNOLA Cédric
c2127a6702
is_empty to empty 2019-04-05 15:49:00 +02:00
Laurent Destailleur
1ffb5a72d5 Replace image with font awesome 2019-04-05 14:45:54 +02:00
Laurent Destailleur
163665e4b5 FIX A page of a site replaced with another when switching in edit mode 
Conflicts:
	htdocs/website/index.php
 2019-04-05 11:36:48 +02:00
Laurent Destailleur
44f113c718 FIX A page of a site replaced with another when switching in edit mode 2019-04-05 11:34:06 +02:00
Laurent Destailleur
9e98421333 CSS 2019-04-05 11:09:58 +02:00
Laurent Destailleur
00cdf13a15 Revert "Do not close php tags" 
This reverts commit 1db134c2a0.
 2019-04-05 11:09:39 +02:00
atm-ph
285e60e9f1 Fix default filter 2019-04-05 10:57:50 +02:00
DALL'AGNOLA Cédric
cf3364d205
fix: count throws an error when parameter is null 
At the first connection, $_SESSION['poscart'] is empty or null and when you try to add an item to the cart in cashdesk you got this:

Warning: count(): Parameter must be an array or an object that implements Countable in /homepages/35/d523563538/htdocs/clickandbuilds/dolibarr/afds/cashdesk/class/Facturation.class.php on line 145

Warning: Cannot modify header information - headers already sent by (output started at /homepages/35/d523563538/htdocs/clickandbuilds/dolibarr/afds/cashdesk/class/Facturation.class.php:145) in /homepages/35/d523563538/htdocs/clickandbuilds/dolibarr/afds/cashdesk/facturation_verif.php on line 234
 2019-04-05 08:28:59 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
5891d0a056 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/projet/list.php
 2019-04-04 17:45:02 +02:00
Laurent Destailleur
9c7464d157 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/list.php
	htdocs/societe/card.php
 2019-04-04 17:42:12 +02:00
Laurent Destailleur
fa95f5575c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/list.php
 2019-04-04 17:41:22 +02:00
Laurent Destailleur
eaf9a2402a Fix length of label 2019-04-04 17:39:51 +02:00
Laurent Destailleur
e79204e81a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/product/list.php
 2019-04-04 17:13:52 +02:00
Alexandre SPANGARO
4335ea9064 NEW: Accounting - Invert module name 2019-04-04 17:13:20 +02:00
Laurent Destailleur
4489db2a70 Fix field surface/weight not loaded 2019-04-04 17:06:26 +02:00
Alexandre SPANGARO
b64ee3af70 FIX: Problem with badge in tab in expedition card 2019-04-04 17:02:18 +02:00
Laurent Destailleur
1ac51b6e06 More complete example to fix migration error from v8 2019-04-04 13:46:01 +02:00
Laurent Destailleur
21b9836508 FIX default value of language of thirdparty 
Conflicts:
	htdocs/societe/card.php
 2019-04-04 11:08:13 +02:00
Laurent Destailleur
3fb97de996 Fix default value of language of thirdparty 2019-04-04 11:05:15 +02:00