lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
70,556 Commits 43 Branches 150 Tags 886 MiB
550dc622ca
Commit Graph

61652 Commits

Author SHA1 Message Date
Frédéric FRANCE
6c85fbbc30
add log and comment 2018-10-18 21:47:10 +02:00
Frédéric FRANCE
b0e24e2b8d
use strict comparaison 2018-10-18 21:24:06 +02:00
Laurent Destailleur
d4bc53660b Code comment and debug filemanager 2018-10-18 21:22:30 +02:00
Frédéric FRANCE
256ee40d0a
Merge remote-tracking branch 'upstream/develop' into patch-16 2018-10-18 21:01:49 +02:00
Frédéric FRANCE
7012b7829f
Merge remote-tracking branch 'upstream/develop' into patch-23 2018-10-18 20:51:39 +02:00
Frédéric FRANCE
c4cc58443a
Merge remote-tracking branch 'upstream/develop' into patch-22 2018-10-18 20:50:03 +02:00
Frédéric FRANCE
5a9e49ef46
Merge remote-tracking branch 'upstream/develop' into patch-21 2018-10-18 20:48:01 +02:00
Frédéric FRANCE
69d3b274aa
Merge remote-tracking branch 'upstream/develop' into patch-20 2018-10-18 20:46:47 +02:00
Frédéric FRANCE
8dd7f62a77
Merge remote-tracking branch 'upstream/develop' into patch-19 2018-10-18 20:45:36 +02:00
Frédéric FRANCE
0f7b1a04d9
Merge remote-tracking branch 'upstream/develop' into patch-15 2018-10-18 20:42:52 +02:00
Frédéric FRANCE
3437943609
Merge remote-tracking branch 'upstream/develop' into patch-9 2018-10-18 20:41:36 +02:00
Frédéric FRANCE
300f80e914
Merge remote-tracking branch 'upstream/develop' into patch-18 2018-10-18 20:39:45 +02:00
Frédéric FRANCE
16211473d7
Merge remote-tracking branch 'upstream/develop' into patch-17 2018-10-18 20:36:43 +02:00
Laurent Destailleur
66cb06eca9 NEW Top menu is always on screen with MD theme. 2018-10-18 17:33:14 +02:00
Laurent Destailleur
05326e271d FIX Filter on invoice type 2018-10-18 17:15:26 +02:00
Laurent Destailleur
7cafdc4d9a Fix phpcs 2018-10-18 16:56:43 +02:00
andreubisquerra
b396aaebc5 Fix delete without any selected line 2018-10-18 16:31:37 +02:00
Juanjo Menent
52ad5c5565 New: works with variants: 
-To edit child price and weight impacts better to see in tab the father price and weight
 2018-10-18 12:21:39 +02:00
Juanjo Menent
c588f5e6c0 New: works with variants: 
-Child label with combination labels
 2018-10-18 10:55:27 +02:00
Juanjo Menent
6c76f9517f New: works with variants: 
-Child label with combination labels
 2018-10-18 10:26:21 +02:00
Juanjo Menent
fd989230a4 New: works with variants: 
-Child label change if parent changes
 2018-10-18 09:09:42 +02:00
Laurent Destailleur
548fafc6e9 Fix trans 2018-10-18 01:32:06 +02:00
Laurent Destailleur
b2a7845c8a Fix trans 2018-10-18 01:28:14 +02:00
Laurent Destailleur
63f4704725 Fix translation 2018-10-18 01:05:10 +02:00
Laurent Destailleur
52840478c0 Clean code 2018-10-17 21:11:07 +02:00
Frédéric FRANCE
db732ddedd
code comment 2018-10-17 20:36:45 +02:00
Frédéric FRANCE
ebc5cb5a96
do not trim int 2018-10-17 20:24:43 +02:00
Frédéric FRANCE
393303fe31
do not trim int 2018-10-17 20:17:43 +02:00
Frédéric FRANCE
47048baa36
do not trim int 2018-10-17 20:14:01 +02:00
Frédéric FRANCE
456bdb5b8c
do not trim int 2018-10-17 20:04:48 +02:00
atm-greg
d86c44e641 Add conf to disable a thirdparty type 2018-10-17 15:55:46 +02:00
gauthier
aea7299970 FIX : use discount with multicurrency 2018-10-17 15:49:08 +02:00
Laurent Destailleur
a66256a799 FIX Hover on the filemanager 2018-10-17 13:22:52 +02:00
Ferran Marcet
ffde353441 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:06:06 +02:00
Ferran Marcet
bdae4e1c4d FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:04:42 +02:00
Ferran Marcet
b462e7b217 FIX When delete a product, llx_product_association rows are not deleted 2018-10-17 10:01:02 +02:00
Frédéric FRANCE
7d8ff04292
Update paiement.class.php 2018-10-17 08:15:12 +02:00
Alexandre SPANGARO
a466104b81 Fix FEC on transaction card 
Fix for FEC compliance
- Remove useless column label_compte
- label_compte is generated with label of accounting account number
- Insert also the label of the journal
 2018-10-17 07:20:04 +02:00
ptibogxiv
f2d0004a3e
ADD civility list in API 2018-10-17 00:36:40 +02:00
Laurent Destailleur
3ef32a24a4 Look and feel 2018-10-17 00:34:39 +02:00
ptibogxiv
a77458cb36
Update facture.class.php 2018-10-17 00:07:21 +02:00
ptibogxiv
7c35eae202
Update commande.class.php 2018-10-17 00:06:24 +02:00
ptibogxiv
3fdf3c95b4
FIX harmony in date name with API 2018-10-17 00:04:44 +02:00
Frédéric FRANCE
70b6c502da
Update menubase.class.php 2018-10-16 23:36:00 +02:00
ptibogxiv
27b7cf8bea
Fix uniformization dates of order in API 2018-10-16 23:31:19 +02:00
Frédéric FRANCE
fa78ab7c66
do not trim int 2018-10-16 23:20:13 +02:00
Frédéric FRANCE
2e77b9fed9
fix phpunit 2018-10-16 22:42:18 +02:00
Frédéric FRANCE
cf1819ea0e
Update html.formmail.class.php 2018-10-16 22:27:34 +02:00
Frédéric FRANCE
2d542d028f
Update html.formmail.class.php 2018-10-16 22:22:57 +02:00
Frédéric FRANCE
4e14c2817c
add errors def to form class 2018-10-16 22:09:11 +02:00
Laurent Destailleur
00dc78dd01 Fix responsive 2018-10-16 21:58:33 +02:00
Frédéric FRANCE
f80de9e65e
fix syntax error and phpcs 2018-10-16 21:49:26 +02:00
Laurent Destailleur
74c74f9e2d
Merge pull request #9776 from ptibogxiv/patch-78 
FIX call of bankaccount class
 2018-10-16 21:43:51 +02:00
Laurent Destailleur
2ce1aaaebf
Update api_thirdparties.class.php 2018-10-16 21:43:40 +02:00
Laurent Destailleur
6a3597d9fd
Merge pull request #9774 from frederic34/datapolicy 
cut long lines >500 to remove phpcs warning
 2018-10-16 21:42:36 +02:00
Laurent Destailleur
e418090053
Merge pull request #9775 from aspangaro/9.0_accountancy 
Fix FEC Missing some information in bookkeeping
 2018-10-16 21:41:52 +02:00
Laurent Destailleur
192168cfa4
Merge pull request #9773 from ptibogxiv/patch-77 
Delete dictionary in ticket API
 2018-10-16 21:40:24 +02:00
Laurent Destailleur
550a66d338
Merge pull request #9772 from ptibogxiv/patch-76 
NEW move ticket dictionary in API /setup
 2018-10-16 21:39:30 +02:00
Laurent Destailleur
737bbf6e7c
Update api_setup.class.php 2018-10-16 21:38:27 +02:00
ptibogxiv
5e20390e15
FIX call of bankaccount class 2018-10-16 21:33:42 +02:00
Alexandre SPANGARO
eb4ffcf1a7 Fix FEC Missing some information in bookkeeping 2018-10-16 21:17:00 +02:00
Frédéric FRANCE
e2a6c9e332
cut long lines >500 2018-10-16 21:05:15 +02:00
ptibogxiv
0e6d3a0f48
FIX delete dictionnary in ticket API 2018-10-16 20:59:06 +02:00
ptibogxiv
c9aaf01a7c
MOVE ticket dictionnary in API /setup 2018-10-16 20:56:10 +02:00
Laurent Destailleur
58240c8f1c
Merge pull request #9767 from ptibogxiv/patch-74 
NEW Save external payment IDs into table of payment
 2018-10-16 20:32:23 +02:00
Laurent Destailleur
8d815c4e6b
Merge pull request #9766 from ptibogxiv/patch-73 
ADD support of external modepayment
 2018-10-16 20:30:24 +02:00
Laurent Destailleur
9959ba3662
Merge pull request #9761 from frederic34/patch-20 
Update actioncomm.class.php
 2018-10-16 20:29:15 +02:00
Laurent Destailleur
0ecf7986f8
Merge pull request #9771 from frederic34/patch-9 
fix phpcs
 2018-10-16 20:28:12 +02:00
Laurent Destailleur
57bb8bcfcd Disabled action are hidden with reason 2018-10-16 20:27:33 +02:00
Frédéric FRANCE
a40271e475
Update bankjournal.php 2018-10-16 20:11:32 +02:00
Frédéric FRANCE
f470068d9d
fix phpcs 2018-10-16 20:10:13 +02:00
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
d57e55387d
Merge branch 'develop' into payloan 2018-10-16 19:43:34 +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
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
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