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

66372 Commits

Author SHA1 Message Date
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2019-05-08 18:24:50 +02:00
Laurent Destailleur
b5d8bc732d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-08 18:22:11 +02:00
Laurent Destailleur
af436b6559 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-05-08 18:21:17 +02:00
Laurent Destailleur
f2e24ed96e Fix bad contact used 2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b Fix showdocument for external modules 2019-05-08 17:31:50 +02:00
Frédéric FRANCE
5fd3109e7f
fix reassort with no product units 2019-05-08 16:28:18 +02:00
Laurent Destailleur
d86f0b7407 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-08 13:27:36 +02:00
Laurent Destailleur
a67d6e7208 css 2019-05-08 13:27:26 +02:00
Laurent Destailleur
018cd3d034
Merge pull request #11143 from code-chicken/patch-5 
FIX Show unit values if configured
 2019-05-08 02:12:04 +02:00
Laurent Destailleur
af2c158821
Update reassort.php 2019-05-08 02:11:50 +02:00
Laurent Destailleur
953c9148ff
Update reassort.php 2019-05-08 02:11:12 +02:00
Laurent Destailleur
8812b95ce0
Merge pull request #11144 from aspangaro/develop 
Fix Eldy menu
 2019-05-08 02:09:35 +02:00
Laurent Destailleur
4ebc281960
Merge pull request #11140 from code-chicken/patch-3 
FIX Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc
 2019-05-08 02:07:14 +02:00
Laurent Destailleur
eb9b9e44d8
Merge pull request #11137 from OPEN-DSI/fix-card-presend-shipment 
Fix contact address substitution before sending by mail in shipment card
 2019-05-08 02:06:36 +02:00
Laurent Destailleur
b58a73cfaf
Merge pull request #11139 from code-chicken/patch-1 
FIX Add support for units
 2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf
Update html.form.class.php 2019-05-08 02:02:07 +02:00
Laurent Destailleur
21c355dd9d
Merge pull request #11133 from aspangaro/9.0_lettering 
FIX sortfield on lettering function
 2019-05-08 01:59:27 +02:00
Laurent Destailleur
cea05b0d7d
Merge pull request #11131 from ptibogxiv/patch-173 
FIX url lettre max & colissimo
 2019-05-08 01:54:12 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
Laurent Destailleur
3606bab973
Merge pull request #11130 from ptibogxiv/patch-172 
FIX : facnumber to ref report takepos
 2019-05-08 00:35:03 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
Laurent Destailleur
12409e944c Fix duplicate error message 2019-05-07 22:57:27 +02:00
Laurent Destailleur
e37519ed89 Fix label 2019-05-07 22:43:59 +02:00
Alexandre SPANGARO
a386f0e9ea Fix Eldy menu 2019-05-07 09:18:27 +02:00
Rüdiger Hahn
475290a4b9
Show unit values if configured 
Fix: Fetch unit values from db and display them if this has been configured
 2019-05-07 09:02:48 +02:00
Laurent Destailleur
c4798c34b0 Fix autocompletion of product on stock correction 2019-05-07 00:26:31 +02:00
Rüdiger Hahn
acb2f59f56
Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc 
cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.
 2019-05-06 19:22:49 +02:00
Rüdiger Hahn
4008e26328
Add support for units 
Fetch units from db when they've been enabled in configuration
 2019-05-06 13:12:41 +02:00
Lionel VESSILLER
8bb4b3f339 Fix contact address substitution before sending by mail in shipment card 2019-05-06 11:12:56 +02:00
Alexandre SPANGARO
c86318ea66 fix 2019-05-05 21:49:04 +02:00
Alexandre SPANGARO
99b068b625 FIX sortfield on lettering function 2019-05-05 21:46:56 +02:00
ptibogxiv
f0fd0ece60
Update 9.0.0-10.0.0.sql 2019-05-05 15:06:10 +02:00
ptibogxiv
7033243572
FIX url lettre max & colissimo 2019-05-05 15:02:00 +02:00
ptibogxiv
c94e621059
FIX : facnumber to ref report takepos 2019-05-04 17:23:57 +02:00
Laurent Destailleur
15dc5f9d23 Fix css 2019-05-04 16:46:09 +02:00
Laurent Destailleur
e42caf1dd9 CSS 2019-05-04 14:54:25 +02:00
Laurent Destailleur
fc18e190d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-04 13:03:28 +02:00
Laurent Destailleur
e01476e10b CSS 2019-05-04 13:03:18 +02:00
Laurent Destailleur
92534cc101
Merge pull request #11127 from Supermanu/del_proj_cat 
FIX: Remove link between categories and project when deleting
 2019-05-04 12:52:35 +02:00
Laurent Destailleur
204fc329a6
Merge pull request #11121 from frederic34/patch-2 
Update thirdparty_lettering_customer.php
 2019-05-04 12:46:35 +02:00
Laurent Destailleur
be68300e35
Merge pull request #11120 from openthink-laurent/fix-date-format-customer-orders-documents 
Fix date format in customer orders documents
 2019-05-04 12:46:09 +02:00
Laurent Destailleur
5caae1f50d css 2019-05-04 12:42:16 +02:00
Laurent Destailleur
60bf3452c3 Hide export in EEC for non european countries 2019-05-04 12:26:54 +02:00
Supermanu
9aed9359ad FIX: Remove link between categories and project when deleting 2019-05-04 12:22:45 +02:00
Laurent Destailleur
3ad478c25e
Merge pull request #11109 from aspangaro/develop 
NEW Manage account sell_intra & sell_export in page accoutancy admin default product
 2019-05-04 12:18:23 +02:00
Laurent Destailleur
702c683ce4
Merge pull request #11115 from ptibogxiv/patch-167 
Fix footer in create ticket page
 2019-05-04 12:16:06 +02:00
Laurent Destailleur
cf4086f970
Merge pull request #11122 from mrsof/patch-2 
FIX : Fatal Errors and Warning
 2019-05-04 12:15:49 +02:00
Laurent Destailleur
918e7e09b4
Merge pull request #11114 from ptibogxiv/patch-166 
FIX footer on list ticket page
 2019-05-04 12:15:24 +02:00
Laurent Destailleur
1ba2de511c
Merge pull request #11118 from openthink-laurent/fix-civility-translation-dutch-dict-language-file 
Fix civility translation in dutch dict language file
 2019-05-04 12:15:08 +02:00
Laurent Destailleur
5487900072
Merge pull request #11113 from ptibogxiv/patch-165 
Fix footer on view ticket page
 2019-05-04 12:14:28 +02:00
Laurent Destailleur
8059f7cf83
Merge pull request #11112 from ptibogxiv/patch-164 
FIX footer public ticket page
 2019-05-04 12:13:13 +02:00
Laurent Destailleur
8bb6bc326c
Merge pull request #11110 from ptibogxiv/patch-163 
Fix JS for payment intent
 2019-05-04 12:12:59 +02:00
ptibogxiv
d7504bb3f6
Fix variable error php with constant main.inc.php 2019-05-04 12:00:14 +02:00
Laurent Destailleur
648b2506ab FIX visible ref on contract link for old contract without ref 2019-05-04 11:45:31 +02:00
Sof
8927b37ae2
FIX : Fatal Errors 
"Countable array" and Class "Facture" not found
 2019-05-04 11:18:14 +02:00
Frédéric FRANCE
0c5d9de13f
Update thirdparty_lettering_supplier.php 2019-05-04 10:38:49 +02:00
Frédéric FRANCE
c595a591a2
Update thirdparty_lettering_customer.php 2019-05-04 10:37:29 +02:00
Frédéric FRANCE
fc520810b7
Update thirdparty_lettering_customer.php 2019-05-04 10:17:04 +02:00
Frédéric FRANCE
4e9b9b61d8
Update thirdparty_lettering_supplier.php 2019-05-04 10:16:27 +02:00
Frédéric FRANCE
4b8083832c
Update thirdparty_lettering_customer.php 2019-05-04 10:13:44 +02:00
Laurent Léonard
8d659d8078 Fix date format in customer orders documents 2019-05-04 07:12:13 +02:00
Laurent Léonard
476d15868c Fix civility translation in dutch dict language file 2019-05-04 06:25:53 +02:00
ptibogxiv
965cf0410f
Fix footer in create ticket page 2019-05-03 17:16:04 +02:00
ptibogxiv
a3bb37eb84
FIX footer on list ticket page 2019-05-03 17:13:58 +02:00
ptibogxiv
78c18b1961
Fix footer on view ticket page 2019-05-03 17:11:13 +02:00
ptibogxiv
24775fec1b
FIX footer public ticket page 2019-05-03 17:06:57 +02:00
ptibogxiv
140cc93490
Update newpayment.php 2019-05-03 15:41:15 +02:00
ptibogxiv
65b21f3c37
Fix JS for payment intent 2019-05-03 15:14:20 +02:00
Alexandre SPANGARO
0359b1820a Merge remote-tracking branch 'upstream/develop' into develop 2019-05-03 14:10:57 +02:00
Alexandre SPANGARO
61547e3f82 NEW Manage account sell_intra & sell_export in page default product 2019-05-03 14:08:20 +02:00
Laurent Destailleur
dd4e70efe7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/accountancy/class/lettering.class.php
 2019-05-03 12:14:17 +02:00
Laurent Destailleur
6797c95164 Fix syntax error 2019-05-03 12:10:29 +02:00
Laurent Destailleur
d9a9c1a086 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-03 12:08:52 +02:00
Laurent Destailleur
e694d0b2c2
Merge pull request #11101 from aspangaro/9.0_lettering 
FIX Massive debug in lettering function
 2019-05-03 11:39:45 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
ATM-Nicolas
ab3ad77704 FIX : Sale representative column didn't increase nbfield variable on proposal list 2019-05-03 10:55:51 +02:00
atm-greg
e0c3cf8360 fix project link for stock correction 2019-05-03 10:24:49 +02:00
Laurent Destailleur
64fb7bd1c2
Merge pull request #11103 from grandoc/new_branch_02_05_2019 
inactive a var_dump
 2019-05-03 02:29:25 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
10d853cdb3 Work on stripe payment using intent with option 
STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION
 2019-05-02 21:54:28 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
4e94d92b70 Fix link 2019-05-02 17:24:05 +02:00
Laurent Destailleur
9b21c827c3 Fix remove var_dump 2019-05-02 17:17:52 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Laurent Destailleur
a764a79c1f Fix scrutinizer error 2019-05-02 16:08:58 +02:00
Laurent Destailleur
2839eedbbf Fix error on emailcollector for tickets 2019-05-02 16:06:14 +02:00
Laurent Destailleur
8d7f24a6d9 FIX Default value on form to send email 2019-05-02 15:34:29 +02:00
Philippe GRAND
bcd96ba8d6 inactive a var_dump 2019-05-02 14:42:02 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/website.inc.php
 2019-05-02 14:41:56 +02:00
Laurent Destailleur
79754eb326 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/comm/remx.php
 2019-05-02 14:39:30 +02:00
ptibogxiv
d09de303d2
Update stripe.php 2019-05-02 14:38:18 +02:00
Laurent Destailleur
45d618cd7a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:54 +02:00
Laurent Destailleur
ae7ba162f2 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-05-02 14:37:46 +02:00
Laurent Destailleur
c222cbfef1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:37:23 +02:00
Philippe GRAND
8e936fda4f FIX : typo error 2019-05-02 14:19:50 +02:00
Laurent Destailleur
220a81dfc8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:19:47 +02:00
Alexandre SPANGARO
7bd99c0eee fix 2019-05-02 14:08:28 +02:00
Alexandre SPANGARO
cbe23741eb FIX Massive debug in lettering function 2019-05-02 14:06:55 +02:00
Laurent Destailleur
e2c7c0574e
Merge pull request #11086 from andreubisquerra/master 
NEW Add history to view and print previous sales on TakePos.
 2019-05-02 14:04:57 +02:00
Laurent Destailleur
1378d5e89b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:03:47 +02:00