Commit Graph

72072 Commits

Author SHA1 Message Date
Laurent Destailleur
d43e1fcef6
Merge pull request #9729 from simnandez/develop
New: works with variants
2018-10-16 20:08:17 +02:00
Laurent Destailleur
33031450a3
Merge pull request #9747 from atm-maxime/fix_status_tobatch
Fix missing status_batch var on product lists #9606
2018-10-16 20:02:56 +02:00
Laurent Destailleur
f07096ea3a
Merge pull request #9760 from frederic34/patch-19
add errors def in htmlformsms
2018-10-16 20:01:41 +02:00
Laurent Destailleur
44d8333633 Fix external link must be after label 2018-10-16 20:00:53 +02:00
Laurent Destailleur
97273ff746
Merge pull request #9768 from ptibogxiv/patch-75
Add source link in stripe
2018-10-16 19:50:11 +02:00
Laurent Destailleur
78d7ea459d
Update paymentmodes.php 2018-10-16 19:49:16 +02:00
Laurent Destailleur
eaa759fd68
Merge pull request #9759 from frederic34/patch-15
add errors def in mailman class
2018-10-16 19:46:42 +02:00
Laurent Destailleur
d56c237d4e
Merge pull request #9756 from atm-maxime/fix_refused_proposal_in_total
Fix refused proposals were counted in totals in project overview
2018-10-16 19:46:19 +02:00
Laurent Destailleur
7cd8b36cea
Merge pull request #9755 from atm-greg/fix_massaction_delete_tasks
FIX modify parenting before task deletion
2018-10-16 19:45:43 +02:00
Laurent Destailleur
51896757f6
Merge pull request #9752 from frederic34/patch-18
Update adherent.class.php
2018-10-16 19:44:24 +02:00
Laurent Destailleur
ae76891853
Merge pull request #9751 from frederic34/patch-17
Update bookkeeping.class.php
2018-10-16 19:44:07 +02:00
Laurent Destailleur
594d8569a9
Merge pull request #9758 from frederic34/payloan
clean loan code
2018-10-16 19:43:40 +02:00
Laurent Destailleur
d57e55387d
Merge branch 'develop' into payloan 2018-10-16 19:43:34 +02:00
Laurent Destailleur
330824748b
Merge pull request #9750 from frederic34/patch-16
code comment
2018-10-16 19:37:32 +02:00
Laurent Destailleur
f1c85cb36d
Merge pull request #9757 from frederic34/patch-9
do not trim int
2018-10-16 19:37:07 +02:00
Laurent Destailleur
575038d3a3
Merge pull request #9769 from atm-ph/fix_7.0_list_duplicate_extrafield_value
Fix list from 'Contacts/Addresses' on company may show duplicate valu…
2018-10-16 19:36:37 +02:00
Laurent Destailleur
63c79f23d6
Merge pull request #9749 from aspangaro/9.0_accountancy
Fix FEC Missing some information on bookeeping
2018-10-16 19:35:14 +02:00
Laurent Destailleur
f0c0c4779b Fix remove yellow alert 2018-10-16 19:32:35 +02:00
Laurent Destailleur
97429aeb7a
Merge pull request #9721 from grandoc/new_branch_10_10_2018
Standardize and update code
2018-10-16 19:30:19 +02:00
Laurent Destailleur
23ffac3bf2
Merge pull request #9770 from Dolibarr/revert-9764-patch-71
Revert "FIX and dolibarize"
2018-10-16 19:21:35 +02:00
Laurent Destailleur
5a4338ad1d
Revert "FIX and dolibarize" 2018-10-16 19:20:51 +02:00
Laurent Destailleur
a7c94ea068
Merge pull request #9764 from ptibogxiv/patch-71
FIX and dolibarize
2018-10-16 19:19:13 +02:00
Laurent Destailleur
605a7896cf
Merge pull request #9744 from atm-maxime/fix_numbering_supplier_credit_note
Fix numbering of supplier credit notes (issue #9624)
2018-10-16 19:17:47 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
08fa0deb24 FIX Bad label on delete button 2018-10-16 18:41:50 +02:00
atm-ph
72dd182b1f Fix list from 'Contacts/Addresses' on company may show duplicate value for extrafields 2018-10-16 18:22:43 +02:00
Laurent Destailleur
502c52b78f Show real path of module if not into custom 2018-10-16 18:09:43 +02:00
ptibogxiv
2cf87db10a
Add source link in stripe 2018-10-16 17:59:58 +02:00
Laurent Destailleur
f5029bf52b Fix template 2018-10-16 17:46:14 +02:00
atm-quentin
e3a0a5e4f5 add fil element on list 2018-10-16 17:22:27 +02:00
Laurent Destailleur
96fce2828e Prepare 9.0 2018-10-16 17:02:36 +02:00
ptibogxiv
00f839e8b4
add external modepayment in payment 2018-10-16 16:57:16 +02:00
ptibogxiv
d377fc26b4
ADD support of external modepayment 2018-10-16 16:55:25 +02:00
ptibogxiv
dc0aaf48d7
FIX and dolibarize 2018-10-16 16:08:20 +02:00
Laurent Destailleur
4bdcb17694 Trans 2018-10-16 15:38:26 +02:00
Philippe GRAND
bd3315528e add links and highlight relevant text 2018-10-16 15:08:06 +02:00
atm-quentin
354825d006 NEW modele pdf canelle_reception to display linked reception to line 2018-10-16 14:58:56 +02:00
Philippe GRAND
059c72c678 add links and highlight relevant text 2018-10-16 14:55:29 +02:00
Philippe GRAND
5f37e07540 add links and highlight relevant text 2018-10-16 14:42:36 +02:00
Philippe GRAND
729ff0b9bb Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018 2018-10-16 14:20:11 +02:00
atm-quentin
a7f3d066e8 add error on create bills massaction 2018-10-16 12:19:48 +02:00
atm-quentin
f11e1940fc NEW mass action list reception create bills for validated reception 2018-10-16 12:05:28 +02:00
Alexandre SPANGARO
a6e000ec79 Merge remote-tracking branch 'upstream/develop' into 9.0_accountancy 2018-10-16 06:33:46 +02:00
Alexandre SPANGARO
a971a2afe6 Fix FEC 2018-10-16 06:32:55 +02:00
Laurent Destailleur
70366e9d91 Missing translation 2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343 Fix missing es translation string 2018-10-16 03:30:17 +02:00
Laurent Destailleur
12cb60040b Fix multilang 2018-10-16 01:52:22 +02:00
Laurent Destailleur
c8607a74bf Load websitepage 2018-10-16 01:39:04 +02:00
Frédéric FRANCE
cab9c81ce2
Update actioncomm.class.php 2018-10-15 21:53:54 +02:00
Alexandre SPANGARO
3a6824da68 Fix FEC Missing label_compte & label_operation 2018-10-15 21:50:05 +02:00